Merge from trunk.

15 files changed, 145 insertions, 88 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59e2a227e42..f69e60e50a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,14 +1,47 @@
-2013-04-23  Tassilo Horn  <tsdh@gnu.org>
+2013-04-24  Reuben Thomas <rrt@sc3d.org>
 
-        * textmodes/reftex.el (reftex-compile-variables): Add autoload
-        cookie.
+        * textmodes/remember.el (remember-handler-functions): Add an
+        option for a new handler `remember-store-in-files'.
+        (remember-data-directory, remember-directory-file-name-format):
+        New options.
+        (remember-store-in-files): New function to store remember notes
+        as separate files within a directory.
+
+2013-04-24  Magnus Henoch  <magnus.henoch@gmail.com>
+
+        * progmodes/compile.el (compilation-next-error-function):
+        Pass "formats" to compilation-find-file (bug#11777).
+
+2013-04-24  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc-bzr.el (vc-bzr-print-log):
+        * vc/vc-hg.el (vc-hg-print-log):
+        * vc/vc-svn.el (vc-svn-print-log):
+        Fix START-REVISION with LIMIT != 1.  (Bug#14168)
+
+        * vc/vc-bzr.el (vc-bzr-print-log):
+        * vc/vc-cvs.el (vc-cvs-print-log):
+        * vc/vc-git.el (vc-git-print-log):
+        * vc/vc-hg.el (vc-hg-print-log):
+        * vc/vc-mtn.el (vc-mtn-print-log):
+        * vc/vc-rcs.el (vc-rcs-print-log):
+        * vc/vc-sccs.el (vc-sccs-print-log):
+        * vc/vc-svn.el (vc-svn-print-log):
+        * vc/vc.el (vc-print-log-internal): Doc fixes.
+
+2013-04-23  Glenn Morris  <rgm@gnu.org>
+
+        * startup.el (normal-no-mouse-startup-screen, normal-about-screen):
+        Remove venerable code attempting to avoid substitute-command-keys.
+
+2013-04-23  Tassilo Horn  <tsdh@gnu.org>
 
-        * textmodes/reftex-vars.el (reftex-label-regexps): Call
-        `reftex-compile-variables' after changes to this variable.
+        * textmodes/reftex-vars.el (reftex-label-regexps):
+        Call `reftex-compile-variables' after changes to this variable.
 
 2013-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * jit-lock.el: Fix signals in jit-lock-force-redisplay.
+        * jit-lock.el: Fix signals in jit-lock-force-redisplay (bug#13542).
         Use lexical-binding.
         (jit-lock-force-redisplay): Use markers, check buffer's continued
         existence and beware narrowed buffers.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 98a89bb2363..d6f136ec92d 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2382,10 +2382,12 @@ This is the value of `next-error-function' in Compilation buffers."
                  ;;            (setq timestamp compilation-buffer-modtime)))
                  )
       (with-current-buffer
-          (compilation-find-file
-           marker
-           (caar (compilation--loc->file-struct loc))
-           (cadr (car (compilation--loc->file-struct loc))))
+          (apply #'compilation-find-file
+                 marker
+                 (caar (compilation--loc->file-struct loc))
+                 (cadr (car (compilation--loc->file-struct loc)))
+                 (compilation--file-struct->formats
+                  (compilation--loc->file-struct loc)))
         (let ((screen-columns
                ;; Obey the compilation-error-screen-columns of the target
                ;; buffer if its major mode set it buffer-locally.
diff --git a/lisp/startup.el b/lisp/startup.el
index dc21005ab94..b7b4c156f02 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1856,11 +1856,8 @@ To quit a partially entered command, type Control-g.\n")
   (insert "\n" (emacs-version)
           "\n" emacs-copyright))
 
-;; No mouse menus, so give help using kbd commands.
 (defun normal-no-mouse-startup-screen ()
-
-  ;; If keys have their default meanings,
-  ;; use precomputed string to save lots of time.
+  "Show a splash screen suitable for displays without mouse support."
   (let* ((c-h-accessible
           ;; If normal-erase-is-backspace is used on a tty, there's
           ;; no way to invoke C-h and you have to use F1 instead.
@@ -1938,47 +1935,24 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
                  'follow-link t)
   (insert "\n")
   (insert "\n" (emacs-version) "\n" emacs-copyright "\n")
-
-  (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
-           (eq (key-binding "\C-h\C-o") 'describe-distribution)
-           (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
-      (progn
-        (insert
-         "
-GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for ")
-        (insert-button "full details"
-                       'action (lambda (_button) (describe-no-warranty))
-                       'follow-link t)
-        (insert ".
-Emacs is Free Software--Free as in Freedom--so you can redistribute copies
-of Emacs and modify it; type C-h C-c to see ")
-        (insert-button "the conditions"
-                       'action (lambda (_button) (describe-copying))
-                       'follow-link t)
-        (insert ".
-Type C-h C-d for information on ")
-        (insert-button "getting the latest version"
-                       'action (lambda (_button) (describe-distribution))
-                       'follow-link t)
-        (insert "."))
-    (insert (substitute-command-keys
-             "
+  (insert (substitute-command-keys
+           "
 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for "))
-    (insert-button "full details"
-                   'action (lambda (_button) (describe-no-warranty))
-                   'follow-link t)
-    (insert (substitute-command-keys ".
+  (insert-button "full details"
+                 'action (lambda (_button) (describe-no-warranty))
+                 'follow-link t)
+  (insert (substitute-command-keys ".
 Emacs is Free Software--Free as in Freedom--so you can redistribute copies
 of Emacs and modify it; type \\[describe-copying] to see "))
-    (insert-button "the conditions"
-                   'action (lambda (_button) (describe-copying))
-                   'follow-link t)
-    (insert (substitute-command-keys".
+  (insert-button "the conditions"
+                 'action (lambda (_button) (describe-copying))
+                 'follow-link t)
+  (insert (substitute-command-keys".
 Type \\[describe-distribution] for information on "))
-    (insert-button "getting the latest version"
-                   'action (lambda (_button) (describe-distribution))
-                   'follow-link t)
-    (insert ".")))
+  (insert-button "getting the latest version"
+                 'action (lambda (_button) (describe-distribution))
+                 'follow-link t)
+  (insert "."))
 
 (defun normal-about-screen ()
   (insert "\n" (emacs-version) "\n" emacs-copyright "\n\n")
@@ -2027,14 +2001,11 @@ Type \\[describe-distribution] for information on "))
   (insert "\tBuying printed manuals from the FSF\n"))
 
 (defun startup-echo-area-message ()
-  (cond ((daemonp)
-         "Starting Emacs daemon.")
-        ((eq (key-binding "\C-h\C-a") 'about-emacs)
-         "For information about GNU Emacs and the GNU system, type C-h C-a.")
-        (t
-         (substitute-command-keys
-          "For information about GNU Emacs and the GNU system, type \
-\\[about-emacs]."))))
+  (if (daemonp)
+      "Starting Emacs daemon."
+    (substitute-command-keys
+     "For information about GNU Emacs and the GNU system, type \
+\\[about-emacs].")))
 
 (defun display-startup-echo-area-message ()
   (let ((resize-mini-windows t))
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index a220002286e..7343d86b06f 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -880,7 +880,8 @@ When changed from Lisp, make sure to call
 effective."
   :set (lambda (symbol value)
          (set symbol value)
-         (reftex-compile-variables))
+         (when (fboundp 'reftex-compile-variables)
+           (reftex-compile-variables)))
   :group 'reftex-defining-label-environments
   :type '(repeat (regexp :tag "Regular Expression")))
 
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 8b5dee5a037..21083fd188a 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -811,7 +811,6 @@ This enforces rescanning the buffer on next use."
      (reftex-kill-buffer (reftex-make-index-buffer-name tag)))
    (cdr (assoc 'index-tags (symbol-value reftex-docstruct-symbol)))))
 
-;;;###autoload
 (defun reftex-compile-variables ()
   ;; Compile the information in reftex-label-alist & Co.
 
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 16b99627400..1286e5d803e 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -216,10 +216,11 @@ All functions are run in the remember buffer."
 Each function is called with the current buffer narrowed to what the
 user wants remembered.
 If any function returns non-nil, the data is assumed to have been
-recorded somewhere by that function. "
+recorded somewhere by that function."
   :type 'hook
   :options '(remember-store-in-mailbox
              remember-append-to-file
+             remember-store-in-files
              remember-diary-extract-entries
              org-remember-handler)
   :group 'remember)
@@ -429,6 +430,27 @@ If you want to remember a region, supply a universal prefix to
         (run-hook-with-args-until-success 'remember-handler-functions))
       (remember-destroy))))
 
+(defcustom remember-data-directory "~/remember"
+  "The directory in which to store remember data as files."
+  :type 'file
+  :group 'remember)
+
+(defcustom remember-directory-file-name-format "%Y-%m-%d_%T-%z"
+  "Format string for the file name in which to store unprocessed data."
+  :type 'file
+  :group 'remember)
+
+(defun remember-store-in-files ()
+  "Store remember data in a file in `remember-data-directory'.
+The file is named after `remember-directory-file-name-format'."
+  (let ((name (format-time-string
+               remember-directory-file-name-format (current-time)))
+        (text (buffer-string)))
+    (with-temp-buffer
+      (insert text)
+      (write-file (convert-standard-filename
+                   (format "%s/%s" remember-data-directory name))))))
+
 ;;;###autoload
 (defun remember-clipboard ()
   "Remember the contents of the current clipboard.
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index d72c1f7f859..06942ad283c 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -694,7 +694,10 @@ REV non-nil gets an error."
                    ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))))
 
 (defun vc-bzr-print-log (files buffer &optional shortlog start-revision limit)
-  "Get bzr change log for FILES into specified BUFFER."
+  "Print commit log associated with FILES into specified BUFFER.
+If SHORTLOG is non-nil, use --line format.
+If START-REVISION is non-nil, it is the newest revision to show.
+If LIMIT is non-nil, show no more than this many entries."
   ;; `vc-do-command' creates the buffer, but we need it before running
   ;; the command.
   (vc-setup-buffer buffer)
@@ -709,6 +712,15 @@ REV non-nil gets an error."
             (when shortlog '("--line"))
             (when start-revision (list (format "-r..%s" start-revision)))
             (when limit (list "-l" (format "%s" limit)))
+            ;; This is to remove --forward, if it has been added by an alias.
+            ;; There is no sensible way to combine --limit and --forward,
+            ;; and it breaks the meaning of START-REVISION as the
+            ;; _newest_ revision.  See bug#14168.
+            ;; FIXME There may be other alias stuff we want to keep.
+            ;; Is there a way to just suppress --forward?
+            ;; As of 2013/4 the only caller uses limit = 1, so it does
+            ;; not matter much.
+            (and start-revision limit (> limit 1) '("--no-aliases"))
             (if (stringp vc-bzr-log-switches)
                 (list vc-bzr-log-switches)
               vc-bzr-log-switches)))))
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 334683898be..7a8f8107509 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -503,7 +503,8 @@ Will fail unless you have administrative privileges on the repo."
 (declare-function vc-rcs-print-log-cleanup "vc-rcs" ())
 
 (defun vc-cvs-print-log (files buffer &optional _shortlog _start-revision limit)
-  "Get change logs associated with FILES."
+  "Print commit log associated with FILES into specified BUFFER.
+Remaining arguments are ignored."
   (require 'vc-rcs)
   ;; It's just the catenation of the individual logs.
   (vc-cvs-command
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 17de931628b..06474cb4604 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -732,9 +732,11 @@ This prompts for a branch to merge from."
 ;;; HISTORY FUNCTIONS
 
 (defun vc-git-print-log (files buffer &optional shortlog start-revision limit)
-  "Get change log associated with FILES.
-Note that using SHORTLOG requires at least Git version 1.5.6,
-for the --graph option."
+  "Print commit log associated with FILES into specified BUFFER.
+If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'.
+\(This requires at least Git version 1.5.6, for the --graph option.)
+If START-REVISION is non-nil, it is the newest revision to show.
+If LIMIT is non-nil, show no more than this many entries."
   (let ((coding-system-for-read vc-git-commits-coding-system))
     ;; `vc-do-command' creates the buffer, but we need it before running
     ;; the command.
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 033e78c20cd..feec015e52a 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -152,7 +152,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
      (2 'change-log-list)
      (3 'change-log-name)
      (4 'change-log-date)))
-  "Mercurial log template for `vc-print-root-log'.
+  "Mercurial log template for `vc-hg-print-log' short format.
 This should be a list (TEMPLATE REGEXP KEYWORDS), where TEMPLATE
 is the \"--template\" argument string to pass to Mercurial,
 REGEXP is a regular expression matching the resulting Mercurial
@@ -246,7 +246,10 @@ highlighting the Log View buffer."
   :group 'vc-hg)
 
 (defun vc-hg-print-log (files buffer &optional shortlog start-revision limit)
-  "Get change log associated with FILES."
+  "Print commit log associated with FILES into specified BUFFER.
+If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'.
+If START-REVISION is non-nil, it is the newest revision to show.
+If LIMIT is non-nil, show no more than this many entries."
   ;; `vc-do-command' creates the buffer, but we need it before running
   ;; the command.
   (vc-setup-buffer buffer)
@@ -257,7 +260,7 @@ highlighting the Log View buffer."
         buffer
       (apply 'vc-hg-command buffer 0 files "log"
              (nconc
-              (when start-revision (list (format "-r%s:" start-revision)))
+              (when start-revision (list (format "-r%s:0" start-revision)))
               (when limit (list "-l" (format "%s" limit)))
               (when shortlog (list "--template" (car vc-hg-root-log-format)))
               vc-hg-log-switches)))))
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 06827a5e027..fbfd89561b7 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -202,6 +202,10 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 ;;   )
 
 (defun vc-mtn-print-log (files buffer &optional _shortlog start-revision limit)
+  "Print commit logs associated with FILES into specified BUFFER.
+_SHORTLOG is ignored.
+If START-REVISION is non-nil, it is the newest revision to show.
+If LIMIT is non-nil, show no more than this many entries."
   (apply 'vc-mtn-command buffer 0 files "log"
          (append
           (when start-revision (list "--from" (format "%s" start-revision)))
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 40d8acb7e07..0a2fc804e6d 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -567,10 +567,14 @@ directory the operation is applied to all registered files beneath it."
     (when (looking-at "[\b\t\n\v\f\r ]+")
       (delete-char (- (match-end 0) (match-beginning 0))))))
 
-(defun vc-rcs-print-log (files buffer &optional shortlog start-revision-ignored limit)
-  "Get change log associated with FILE.  If FILE is a
-directory the operation is applied to all registered files beneath it."
-  (vc-do-command (or buffer "*vc*") 0 "rlog" (mapcar 'vc-name (vc-expand-dirs files)))
+(defun vc-rcs-print-log (files buffer &optional shortlog
+                               start-revision-ignored limit)
+  "Print commit log associated with FILES into specified BUFFER.
+Remaining arguments are ignored.
+If FILE is a directory the operation is applied to all registered
+files beneath it."
+  (vc-do-command (or buffer "*vc*") 0 "rlog"
+                 (mapcar 'vc-name (vc-expand-dirs files)))
   (with-current-buffer (or buffer "*vc*")
     (vc-rcs-print-log-cleanup))
   (when limit 'limit-unsupported))
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index bfbe42222e9..d3cf650ddf9 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -350,7 +350,8 @@ revert all subfiles."
 ;;;
 
 (defun vc-sccs-print-log (files buffer &optional shortlog start-revision-ignored limit)
-  "Get change log associated with FILES."
+  "Print commit log associated with FILES into specified BUFFER.
+Remaining arguments are ignored."
   (setq files (vc-expand-dirs files))
   (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files))
   (when limit 'limit-unsupported))
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 923888b460b..a94bf0d6117 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -494,7 +494,10 @@ or svn+ssh://."
   (set (make-local-variable 'log-view-per-file-logs) nil))
 
 (defun vc-svn-print-log (files buffer &optional shortlog start-revision limit)
-  "Get change log(s) associated with FILES."
+  "Print commit log associated with FILES into specified BUFFER.
+SHORTLOG is ignored.
+If START-REVISION is non-nil, it is the newest revision to show.
+If LIMIT is non-nil, show no more than this many entries."
   (save-current-buffer
     (vc-setup-buffer buffer)
     (let ((inhibit-read-only t))
@@ -512,7 +515,7 @@ or svn+ssh://."
                    (append
                     (list
                      (if start-revision
-                         (format "-r%s" start-revision)
+                         (format "-r%s:1" start-revision)
                        ;; By default Subversion only shows the log up to the
                        ;; working revision, whereas we also want the log of the
                        ;; subsequent commits.  At least that's what the
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 7f03affb6b7..5e1d27c0ea3 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -356,9 +356,11 @@
 ;;   If LIMIT is true insert only insert LIMIT log entries.  If the
 ;;   backend does not support limiting the number of entries to show
 ;;   it should return `limit-unsupported'.
-;;   If START-REVISION is given, then show the log starting from the
-;;   revision.  At this point START-REVISION is only required to work
-;;   in conjunction with LIMIT = 1.
+;;   If START-REVISION is given, then show the log starting from that
+;;   revision ("starting" in the sense of it being the _newest_
+;;   revision shown, rather than the working revision, which is normally
+;;   the case).  Not all backends support this.  At present, this is
+;;   only ever used with LIMIT = 1 (by vc-annotate-show-log-revision-at-line).
 ;;
 ;; * log-outgoing (backend remote-location)
 ;;
@@ -2111,14 +2113,11 @@ or if PL-RETURN is 'limit-unsupported."
                                       &optional is-start-revision limit)
   "For specified BACKEND and FILES, show the VC log.
 Leave point at WORKING-REVISION, if it is non-nil.
-If IS-START-REVISION is non-nil, start the log from WORKING-REVISION.
-Show up to LIMIT entries (non-nil means unlimited).
-\(IS-START-REVISION non-nil might not work correctly if LIMIT is not 1.)"
-  ;; The parenthetical remark is based on the commentary of vc.el for
-  ;; "print log": "At this point START-REVISION is only required to work
-  ;; in conjunction with LIMIT = 1."  The only thing that passes
-  ;; IS-START-REVISION non-nil is vc-annotate-show-log-revision-at-line,
-  ;; which sets LIMIT = 1.
+If IS-START-REVISION is non-nil, start the log from WORKING-REVISION
+\(not all backends support this); i.e., show only WORKING-REVISION and
+earlier revisions.  Show up to LIMIT entries (non-nil means unlimited)."
+  ;; As of 2013/04 the only thing that passes IS-START-REVISION non-nil
+  ;; is vc-annotate-show-log-revision-at-line, which sets LIMIT = 1.
 
   ;; Don't switch to the output buffer before running the command,
   ;; so that any buffer-local settings in the vc-controlled