diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 19 | ||||
| -rw-r--r-- | lisp/info.el | 4 | ||||
| -rw-r--r-- | lisp/mail/rmailsum.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/octave-mod.el | 5 |
4 files changed, 26 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3c0f28da4db..fbd6e3c631c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +2012-12-06 Chong Yidong <cyd@gnu.org> + + * ffap.el (ffap-replace-file-component): Fix typo. + +2012-12-06 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/octave-mod.el (octave-mark-block): Move out of tokens and + fix open-paren-like token test (bug#12785). + +2012-12-06 Glenn Morris <rgm@gnu.org> + + * mail/rmailsum.el (rmail-new-summary): Tweak for + rmail-maybe-display-summary changing buffer. (Bug#13066) + +2012-12-06 Juri Linkov <juri@jurta.org> + + * info.el (Info-fontify-node): Don't hide the last newline. + (Bug#12272) + 2012-12-06 Katsumi Yamaoka <yamaoka@jpl.org> * mail/mailabbrev.el (mail-abbrev-expand-wrapper): Work in minibuffer diff --git a/lisp/info.el b/lisp/info.el index 2c2d485e245..6624c0d61b2 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -4826,8 +4826,8 @@ first line or header line, and for breadcrumb links.") ;; Hide empty lines at the end of the node. (goto-char (point-max)) (skip-chars-backward "\n") - (when (< (1+ (point)) (point-max)) - (put-text-property (1+ (point)) (point-max) 'invisible t)) + (when (< (point) (1- (point-max))) + (put-text-property (point) (1- (point-max)) 'invisible t)) (set-buffer-modified-p nil)))) diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 612ccbdfd9e..cacc6e19416 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -428,7 +428,7 @@ nil for FUNCTION means all messages." ;; This is how rmail makes the summary buffer reappear. ;; We do this here to make the window the proper size. (rmail-select-summary nil) - (set-buffer rmail-summary-buffer)) + (set-buffer sumbuf)) (rmail-summary-goto-msg mesg t t) (rmail-summary-construct-io-menu) (message "Computing summary lines...done"))) diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index ab5a19f8a2f..da40cf51be9 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -794,11 +794,14 @@ does not end in `...' or `\\' or is inside an open parenthesis list." "Put point at the beginning of this Octave block, mark at the end. The block marked is the one that contains point or follows point." (interactive) + (if (and (looking-at "\\sw\\|\\s_") + (looking-back "\\sw\\|\\s_" (1- (point)))) + (skip-syntax-forward "w_")) (unless (or (looking-at "\\s(") (save-excursion (let* ((token (funcall smie-forward-token-function)) (level (assoc token smie-grammar))) - (and level (null (cadr level)))))) + (and level (not (numberp (cadr level))))))) (backward-up-list 1)) (mark-sexp)) |