Merge remote-tracking branch 'origin/trunk' into xwidget

22 files changed, 179 insertions, 91 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 249a2f21ccb..8f675bfcda6 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * functions.texi (Lambda Expressions): Lambda expressions don't
+        evaluate to themselves in general (bug#11782).
+
 2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * loading.texi (Autoload):
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 999923f5b84..7768c147827 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -196,9 +196,8 @@ an example:
 @end example
 
 @noindent
-In Emacs Lisp, such a list is valid as an expression---it evaluates to
-itself.  But its main use is not to be evaluated as an expression, but
-to be called as a function.
+In Emacs Lisp, such a list is a valid expression which evaluates to
+a function object.
 
   A lambda expression, by itself, has no name; it is an @dfn{anonymous
 function}.  Although lambda expressions can be used this way
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f9302680be..3fa1ffe40a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2013-05-29  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/octave.el (octave-indent-comment): Tweak regexps.
+        (octave-help): Small simplification.
+
+        * emacs-lisp/smie.el (smie-highlight-matching-block): Always turn
+        off the highlight first.
+
+2013-05-29  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/idlwave.el (idlwave-concatenate-rinfo-lists):
+        Handle idlwave-last-system-routine-info-cons-cell being nil.
+
+        * progmodes/idlwave.el (idlwave-scan-user-lib-files)
+        (idlwave-write-paths): Simplify via with-temp-buffer.
+
+        * emulation/cua-gmrk.el: Also load cua-base, cua-rect at run time.
+        * emulation/cua-rect.el: Also load cua-base at run time.
+
+        * progmodes/cperl-mode.el (imenu-choose-buffer-index)
+        (file-of-tag, etags-snarf-tag, etags-goto-tag-location): Declare.
+        (cperl-imenu-on-info): Require imenu.
+
 2013-05-28  Alan Mackenzie  <acm@muc.de>
 
         Handle "capitalised keywords" correctly.
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 9e338a0f4be..a88b9d70930 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -1060,10 +1060,10 @@ This uses SMIE's tables and is expected to be placed on `post-self-insert-hook'.
                            beg end (current-buffer))
              (overlay-put smie--highlight-matching-block-overlay
                           'face 'smie-matching-block-highlight))))
-      (save-excursion
-        (condition-case nil
-            (if (nth 8 (syntax-ppss))
-                (overlay-put smie--highlight-matching-block-overlay 'face nil)
+      (overlay-put smie--highlight-matching-block-overlay 'face nil)
+      (unless (nth 8 (syntax-ppss))
+        (save-excursion
+          (condition-case nil
               (let ((token
                      (or (funcall beg-of-tok)
                          (funcall beg-of-tok
@@ -1082,11 +1082,8 @@ This uses SMIE's tables and is expected to be placed on `post-self-insert-hook'.
                   (let ((beg (point))
                         (opener (funcall smie-forward-token-function)))
                     (when (assoc opener smie-closer-alist)
-                      (funcall highlight beg (point)))))
-                 (t (overlay-put smie--highlight-matching-block-overlay
-                                 'face nil)))))
-          (scan-error
-           (overlay-put smie--highlight-matching-block-overlay 'face nil)))))))
+                      (funcall highlight beg (point)))))))
+            (scan-error)))))))
 
 (defvar smie--highlight-matching-block-timer nil)
 
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index d2901bb966c..78665624946 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -25,10 +25,8 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cua-base)
-  (require 'cua-rect)
-  )
+(require 'cua-base)
+(require 'cua-rect)
 
 ;;; Global Marker
 
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 220469b1ed9..16d109c6360 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -31,8 +31,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cua-base))
+(require 'cua-base)
 
 ;;; Rectangle support
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d475a259113..3cfca4525f0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,31 @@
+2013-05-29  Glenn Morris  <rgm@gnu.org>
+
+        * gnus-ems.el (set-process-plist): Every supported Emacs has this.
+
+        * gnus-group.el (gnus-sequence-of-unread-articles)
+        (gnus-summary-add-mark, gnus-mark-article-as-read)
+        (gnus-group-make-articles-read): Declare.
+
+        * gnus-sum.el (gnus-parameter-list-identifier)
+        (gnus-article-stop-animations, gnus-stop-downloads)
+        (gnus-article-only-boring-p, article-goto-body)
+        (gnus-flush-original-article-buffer, article-narrow-to-head)
+        (gnus-article-hidden-text-p, gnus-delete-wash-type)
+        (gnus-summary-save-in-pipe, gnus-article-show-summary): Declare.
+
+        * gnus.el: No need to eval-and-compile autoloads.
+
+        * gravatar.el (help-function-arglist): Autoload.
+
+        * nnimap.el (gnus-refer-thread-use-nnir): Declare.
+
+        * nnmail.el (nnmail-fancy-expiry-target): Maybe use mail-dont-reply-to.
+
+        * spam.el: No need to load spam-report when compiling.
+        No need to eval-and-compile autoloads.
+        (spam-report-resend-to): Declare.
+        (spam-report-resend-register-routine): Require 'spam-report.
+
 2013-05-24  Julien Danjou  <julien@danjou.info>
 
         * sieve.el (sieve-setup-buffer): Fix default port value in sieve buffer
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index ac8bb74f1f5..4d9b5798247 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -221,8 +221,8 @@
         'window-inside-pixel-edges
       'window-pixel-edges))
 
-  (if (fboundp 'set-process-plist)
-      (progn
+  (if (or (featurep 'emacs) (fboundp 'set-process-plist))
+      (progn                            ; these exist since Emacs 22.1
         (defalias 'gnus-set-process-plist 'set-process-plist)
         (defalias 'gnus-process-plist 'process-plist)
         (defalias 'gnus-process-get 'process-get)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 2c45d3c24a1..30ce184ed66 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3591,6 +3591,8 @@ Cross references (Xref: header) of articles are ignored."
   (interactive "P")
   (gnus-group-catchup-current n 'all))
 
+(declare-function gnus-sequence-of-unread-articles "gnus-sum" (group))
+
 (defun gnus-group-catchup (group &optional all)
   "Mark all articles in GROUP as read.
 If ALL is non-nil, all articles are marked as read.
@@ -4493,6 +4495,8 @@ and the second element is the address."
                      (sort (nconc (gnus-uncompress-range (cdr m))
                                   (copy-sequence articles)) '<) t))))))
 
+(declare-function gnus-summary-add-mark "gnus-sum" (article type))
+
 (defun gnus-add-mark (group mark article)
   "Mark ARTICLE in GROUP with MARK, whether the group is displayed or not."
   (let ((buffer (gnus-summary-buffer-name group)))
@@ -4657,6 +4661,9 @@ you the groups that have both dormant articles and cached articles."
   (let ((gnus-group-list-option 'limit))
     (gnus-group-list-plus args)))
 
+(declare-function gnus-mark-article-as-read "gnu-sum" (article &optional mark))
+(declare-function gnus-group-make-articles-read "gnus-sum" (group articles))
+
 (defun gnus-group-mark-article-read (group article)
   "Mark ARTICLE read."
   (let ((buffer (gnus-summary-buffer-name group))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index f0b17341e77..c8f593ea403 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -5492,6 +5492,8 @@ or a straight list of headers."
          (cdr (assq number gnus-newsgroup-scored))
          (memq number gnus-newsgroup-processable))))))
 
+(declare-function gnus-parameter-list-identifier "gnus-art" (name) t)
+
 (defun gnus-group-get-list-identifiers (group)
   "Get list identifier regexp for GROUP."
   (or (gnus-parameter-list-identifier group)
@@ -7267,6 +7269,9 @@ If FORCE (the prefix), also save the .newsrc file(s)."
       (unless quit-config
         (setq gnus-newsgroup-name nil)))))
 
+(declare-function gnus-article-stop-animations "gnus-art" ())
+(declare-function gnus-stop-downloads "gnus-art" ())
+
 (defalias 'gnus-summary-quit 'gnus-summary-exit-no-update)
 (defun gnus-summary-exit-no-update (&optional no-questions)
   "Quit reading current newsgroup without updating read article info."
@@ -7859,6 +7864,8 @@ If UNREAD is non-nil, only unread articles are selected."
    (and gnus-auto-select-same
         (gnus-summary-article-subject))))
 
+(declare-function gnus-article-only-boring-p "gnus-art" ())
+
 (defun gnus-summary-next-page (&optional lines circular stop)
   "Show next page of the selected article.
 If at the end of the current article, select the next article.
@@ -8426,6 +8433,8 @@ If REVERSE (the prefix), limit to articles that don't match."
   (interactive "sMatch headers (regexp): \nP")
   (gnus-summary-limit-to-bodies match reverse t))
 
+(declare-function article-goto-body "gnus-art" ())
+
 (defun gnus-summary-limit-to-bodies (match &optional reverse headersp)
   "Limit the summary buffer to articles that have bodies that match MATCH.
 If REVERSE (the prefix), limit to articles that don't match."
@@ -9556,6 +9565,8 @@ to save in."
           (ps-spool-buffer-with-faces)
         (ps-spool-buffer)))))
 
+(declare-function gnus-flush-original-article-buffer "gnus-art" ())
+
 (defun gnus-summary-show-complete-article ()
   "Show a complete version of the current article.
 This is only useful if you're looking at a partial version of the
@@ -9679,6 +9690,10 @@ If ARG is a negative number, turn header display off."
                t)))
   (gnus-summary-show-article))
 
+(declare-function article-narrow-to-head "gnus-art" ())
+(declare-function gnus-article-hidden-text-p "gnus-art" (type))
+(declare-function gnus-delete-wash-type "gnus-art" (type))
+
 (defun gnus-summary-toggle-header (&optional arg)
   "Show the headers if they are hidden, or hide them if they are shown.
 If ARG is a positive number, show the entire header.
@@ -11962,6 +11977,8 @@ will not be marked as saved."
     (gnus-set-mode-line 'summary)
     n))
 
+(declare-function gnus-summary-save-in-pipe "gnus-art" (&optional command raw))
+
 (defun gnus-summary-pipe-output (&optional n sym)
   "Pipe the current article to a subprocess.
 If N is a positive number, pipe the N next articles.
@@ -12914,6 +12931,7 @@ If ALL is a number, fetch this number of articles."
   (gnus-summary-position-point))
 
 ;;; Bookmark support for Gnus.
+(declare-function gnus-article-show-summary "gnus-art" ())
 (declare-function bookmark-make-record-default
                   "bookmark" (&optional no-file no-context posn))
 (declare-function bookmark-prop-get "bookmark" (bookmark prop))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index fd6ebf338fa..2c2dbd90c56 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -4243,8 +4243,7 @@ parameters."
       (setq valids (cdr valids)))
     outs))
 
-(eval-and-compile
-  (autoload 'message-y-or-n-p "message" nil nil 'macro))
+(autoload 'message-y-or-n-p "message" nil nil 'macro)
 
 (defun gnus-read-group (prompt &optional default)
   "Prompt the user for a group name.
diff --git a/lisp/gnus/gravatar.el b/lisp/gnus/gravatar.el
index bf6295aa7b8..985ed2c7b0d 100644
--- a/lisp/gnus/gravatar.el
+++ b/lisp/gnus/gravatar.el
@@ -103,6 +103,8 @@ If no image available, return 'error."
         (gravatar-create-image data nil t)
       'error)))
 
+(autoload 'help-function-arglist "help-fns")
+
 ;;;###autoload
 (defun gravatar-retrieve (mail-address cb &optional cbargs)
   "Retrieve MAIL-ADDRESS gravatar and call CB on retrieval.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 9c18bc2cff0..8fdd69b47da 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1642,6 +1642,7 @@ textual parts.")
   (setq nnimap-status-string "Read-only server")
   nil)
 
+(defvar gnus-refer-thread-use-nnir)     ; gnus-sum
 (declare-function gnus-fetch-headers "gnus-sum"
                   (articles &optional limit force-new dependencies))
 
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index a266567987d..28b28369ae4 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1954,7 +1954,9 @@ If TIME is nil, then return the cutoff time for oldness instead."
                  (and (string-match (cadr regexp-target-pair) to)
                       (let ((rmail-dont-reply-to-names
                              (message-dont-reply-to-names)))
-                        (equal (rmail-dont-reply-to from) "")))))
+                        (equal (if (fboundp 'rmail-dont-reply-to)
+                                   (rmail-dont-reply-to from)
+                                 (mail-dont-reply-to from)) "")))))
         (setq target (format-time-string (caddr regexp-target-pair) date)))
        ((and (not (equal header 'to-from))
              (string-match (cadr regexp-target-pair)
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 725017ca116..8d689bf26bd 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -50,7 +50,6 @@
 ;;; for the definitions of group content classification and spam processors
 (require 'gnus)
 
-(eval-when-compile (require 'spam-report))
 (eval-when-compile (require 'hashcash))
 
 ;; for nnimap-split-download-body-default
@@ -60,11 +59,10 @@
 (autoload 'query-dig "dig")
 
 ;; autoload spam-report
-(eval-and-compile
-  (autoload 'spam-report-gmane "spam-report")
-  (autoload 'spam-report-gmane-spam "spam-report")
-  (autoload 'spam-report-gmane-ham "spam-report")
-  (autoload 'spam-report-resend "spam-report"))
+(autoload 'spam-report-gmane "spam-report")
+(autoload 'spam-report-gmane-spam "spam-report")
+(autoload 'spam-report-gmane-ham "spam-report")
+(autoload 'spam-report-resend "spam-report")
 
 ;; autoload gnus-registry
 (autoload 'gnus-registry-group-count "gnus-registry")
@@ -2473,7 +2471,10 @@ With a non-nil REMOVE, remove the ADDRESSES."
 (defun spam-report-resend-register-ham-routine (articles)
   (spam-report-resend-register-routine articles t))
 
+(defvar spam-report-resend-to)
+
 (defun spam-report-resend-register-routine (articles &optional ham)
+  (require 'spam-report)
   (let* ((resend-to-gp
           (if ham
               (gnus-parameter-ham-resend-to gnus-newsgroup-name)
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 407d4042c39..910e7c49d2a 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -6671,10 +6671,13 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
   (buffer-substring
    (match-beginning 1) (match-end 1)))
 
+(declare-function imenu-choose-buffer-index "imenu" (&optional prompt alist))
+
 (defun cperl-imenu-on-info ()
   "Shows imenu for Perl Info Buffer.
 Opens Perl Info buffer if needed."
   (interactive)
+  (require 'imenu)
   (let* ((buffer (current-buffer))
          imenu-create-index-function
          imenu-prev-index-position-function
@@ -7134,6 +7137,10 @@ Use as
 (defvar cperl-hierarchy '(() ())
   "Global hierarchy of classes.")
 
+;; Follows call to (autoloaded) visit-tags-table.
+(declare-function file-of-tag "etags" (&optional relative))
+(declare-function etags-snarf-tag "etags" (&optional use-explicit))
+
 (defun cperl-tags-hier-fill ()
   ;; Suppose we are in a tag table cooked by cperl.
   (goto-char 1)
@@ -7177,6 +7184,7 @@ Use as
       (end-of-line))))
 
 (declare-function x-popup-menu "menu.c" (position menu))
+(declare-function etags-goto-tag-location "etags" (tag-info))
 
 (defun cperl-tags-hier-init (&optional update)
   "Show hierarchical menu of classes and methods.
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index aeaf1acb2ac..ba9a632b949 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -5078,11 +5078,14 @@ Cache to disk for quick recovery."
   ;; The sequence here is important because earlier definitions shadow
   ;; later ones.  We assume that if things in the buffers are newer
   ;; then in the shell of the system, they are meant to be different.
-  (setcdr idlwave-last-system-routine-info-cons-cell
-          (append idlwave-buffer-routines
-                  idlwave-compiled-routines
-                  idlwave-library-catalog-routines
-                  idlwave-user-catalog-routines))
+  (let ((temp (append idlwave-buffer-routines
+                      idlwave-compiled-routines
+                      idlwave-library-catalog-routines
+                      idlwave-user-catalog-routines)))
+    ;; Not actually used for anything?
+    (if idlwave-last-system-routine-info-cons-cell
+        (setcdr idlwave-last-system-routine-info-cons-cell temp)
+      (setq idlwave-last-system-routine-info-cons-cell (cons temp nil))))
   (setq idlwave-class-alist nil)
 
   ;; Give a message with information about the number of routines we have.
@@ -5481,30 +5484,21 @@ directories and save the routine info.
     (message "Creating user catalog file...")
     (kill-buffer "*idlwave-scan.pro*")
     (kill-buffer (get-buffer-create "*IDLWAVE Widget*"))
-    (let ((font-lock-maximum-size 0)
-          (auto-mode-alist nil))
-      (find-file idlwave-user-catalog-file))
-    (if (and (boundp 'font-lock-mode)
-             font-lock-mode)
-        (font-lock-mode 0))
-    (erase-buffer)
-    (insert ";; IDLWAVE user catalog file\n")
-    (insert (format ";; Created %s\n\n" (current-time-string)))
-
-    ;; Define the routine info list
-    (insert "\n(setq idlwave-user-catalog-routines\n    '(")
-    (let ((standard-output (current-buffer)))
-      (mapc (lambda (x)
-              (insert "\n    ")
-              (prin1 x)
-              (goto-char (point-max)))
-            idlwave-user-catalog-routines))
-    (insert (format "))\n\n;;; %s ends here\n"
-                    (file-name-nondirectory idlwave-user-catalog-file)))
-    (goto-char (point-min))
-    ;; Save the buffer
-    (save-buffer 0)
-    (kill-buffer (current-buffer)))
+    (with-temp-buffer
+      (insert ";; IDLWAVE user catalog file\n")
+      (insert (format ";; Created %s\n\n" (current-time-string)))
+
+      ;; Define the routine info list
+      (insert "\n(setq idlwave-user-catalog-routines\n    '(")
+      (let ((standard-output (current-buffer)))
+        (mapc (lambda (x)
+                (insert "\n    ")
+                (prin1 x)
+                (goto-char (point-max)))
+              idlwave-user-catalog-routines))
+      (insert (format "))\n\n;;; %s ends here\n"
+                      (file-name-nondirectory idlwave-user-catalog-file)))
+      (write-region nil nil idlwave-user-catalog-file)))
   (message "Creating user catalog file...done")
   (message "Info for %d routines saved in %s"
            (length idlwave-user-catalog-routines)
@@ -5522,31 +5516,23 @@ directories and save the routine info.
 (defun idlwave-write-paths ()
   (interactive)
   (when (and idlwave-path-alist idlwave-system-directory)
-    (let ((font-lock-maximum-size 0)
-          (auto-mode-alist nil))
-      (find-file idlwave-path-file))
-    (if (and (boundp 'font-lock-mode)
-             font-lock-mode)
-        (font-lock-mode 0))
-    (erase-buffer)
-    (insert ";; IDLWAVE paths\n")
-    (insert (format ";; Created %s\n\n" (current-time-string)))
+    (with-temp-buffer
+      (insert ";; IDLWAVE paths\n")
+      (insert (format ";; Created %s\n\n" (current-time-string)))
     ;; Define the variable which knows the value of "!DIR"
-    (insert (format "\n(setq idlwave-system-directory \"%s\")\n"
-                    idlwave-system-directory))
-
-    ;; Define the variable which contains a list of all scanned directories
-    (insert "\n(setq idlwave-path-alist\n    '(")
-    (let ((standard-output (current-buffer)))
-      (mapc (lambda (x)
-              (insert "\n      ")
-              (prin1 x)
-              (goto-char (point-max)))
-            idlwave-path-alist))
-    (insert "))\n")
-    (save-buffer 0)
-    (kill-buffer (current-buffer))))
-
+      (insert (format "\n(setq idlwave-system-directory \"%s\")\n"
+                      idlwave-system-directory))
+
+      ;; Define the variable which contains a list of all scanned directories
+      (insert "\n(setq idlwave-path-alist\n    '(")
+      (let ((standard-output (current-buffer)))
+        (mapc (lambda (x)
+                (insert "\n      ")
+                (prin1 x)
+                (goto-char (point-max)))
+              idlwave-path-alist))
+      (insert "))\n")
+      (write-region nil nil idlwave-path-file))))
 
 (defun idlwave-expand-path (path &optional default-dir)
   ;; Expand parts of path starting with '+' recursively into directory list.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 4985f5fb38e..bacd37b3d3c 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -446,11 +446,11 @@ Non-nil means always go to the next Octave code line after sending."
     (back-to-indentation)
     (cond
      ((octave-in-string-or-comment-p) nil)
-     ((looking-at-p "\\s<\\{3,\\}")
+     ((looking-at-p "\\(\\s<\\)\\1\\{2,\\}")
       0)
      ;; Exclude %{, %} and %!.
      ((and (looking-at-p "\\s<\\(?:[^{}!]\\|$\\)")
-           (not (looking-at-p "\\s<\\s<")))
+           (not (looking-at-p "\\(\\s<\\)\\1")))
       (comment-choose-indent)))))
 
 
@@ -1637,8 +1637,7 @@ if ismember(exist(\"%s\"), [2 3 5 103]) print_usage(\"%s\") endif\n"
         ;; Make 'See also' clickable
         (with-syntax-table octave-mode-syntax-table
           (when (re-search-forward "^\\s-*See also:" nil t)
-            (let ((end (or (save-excursion (re-search-forward "^\\s-*$" nil t))
-                           (point-max))))
+            (let ((end (save-excursion (re-search-forward "^\\s-*$" nil t))))
               (while (re-search-forward "\\_<\\(?:\\sw\\|\\s_\\)+\\_>" end t)
                 (make-text-button (match-beginning 0)
                                   ;; If the match ends with . exclude it.
diff --git a/src/ChangeLog b/src/ChangeLog
index b1f13e62b40..4b1281c17e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents): Preserve undo info when reverting
+        a buffer (bug#8447).
+
 2013-05-27  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (pos_visible_p): When CHARPOS is displayed frrom a
@@ -25,8 +30,8 @@
         (struct MonitorInfo): New struct.
         (free_monitors, make_monitor_attribute_list): Declare.
 
-        * frame.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): New
-        Lisp_Object:s.
+        * frame.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource):
+        New Lisp_Object:s.
         (free_monitors, make_monitor_attribute_list): New functions.
         (syms_of_frame): DEFSYM Qgeometry, Qworkarea, Qmm_size, Qframes,
         Qsource.
diff --git a/src/fileio.c b/src/fileio.c
index f20721251e6..e2b1007fb0b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3506,6 +3506,11 @@ by calling `format-decode', which see.  */)
   bool set_coding_system = 0;
   Lisp_Object coding_system;
   bool read_quit = 0;
+  /* If the undo log only contains the insertion, there's no point
+     keeping it.  It's typically when we first fill a file-buffer.  */
+  bool empty_undo_list_p
+    = (!NILP (visit) && NILP (BVAR (current_buffer, undo_list))
+       && BEG == Z);
   Lisp_Object old_Vdeactivate_mark = Vdeactivate_mark;
   bool we_locked_file = 0;
   bool deferred_remove_unwind_protect = 0;
@@ -4108,6 +4113,7 @@ by calling `format-decode', which see.  */)
         {
           del_range_byte (same_at_start, same_at_end, 0);
           temp = GPT;
+          eassert (same_at_start == GPT_BYTE);
           same_at_start = GPT_BYTE;
         }
       else
@@ -4120,6 +4126,7 @@ by calling `format-decode', which see.  */)
         = buf_bytepos_to_charpos (XBUFFER (conversion_buffer),
                                   same_at_start - BEGV_BYTE
                                   + BUF_BEG_BYTE (XBUFFER (conversion_buffer)));
+      eassert (same_at_start_charpos == temp - (BEGV - BEG));
       inserted_chars
         = (buf_bytepos_to_charpos (XBUFFER (conversion_buffer),
                                    same_at_start + inserted - BEGV_BYTE
@@ -4404,7 +4411,7 @@ by calling `format-decode', which see.  */)
 
   if (!NILP (visit))
     {
-      if (!EQ (BVAR (current_buffer, undo_list), Qt) && !nochange)
+      if (empty_undo_list_p)
         bset_undo_list (current_buffer, Qnil);
 
       if (NILP (handler))
@@ -4546,7 +4553,7 @@ by calling `format-decode', which see.  */)
           p = XCDR (p);
         }
 
-      if (NILP (visit))
+      if (!empty_undo_list_p)
         {
           bset_undo_list (current_buffer, old_undo);
           if (CONSP (old_undo) && inserted != old_inserted)
diff --git a/test/ChangeLog b/test/ChangeLog
index 8ab70c98c82..56e019ec4af 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-29  Leo Liu  <sdl.web@gmail.com>
+
+        * indent/octave.m: Tweak.
+
 2013-05-26  Aidan Gauland  <aidalgol@amuri.net>
 
         * tests/eshell.el: Rewrite tests using ERT.
diff --git a/test/indent/octave.m b/test/indent/octave.m
index 55f8cc045f4..e5bae850589 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -2311,7 +2311,7 @@ function dep = is_architecture_dependent (nm)
       ext(end) = [];
     else
       isglob = false;           # I am a test
-                                # me too
+                                #%% me too
 ### I shall align to column 0
     endif
     pos = findstr (nm, ext);