auto upstream

9 files changed, 99 insertions, 47 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2878db6271f..fd2186fcfb2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,30 @@
+2013-02-11  Elias Pipping  <pipping@lavabit.com>
+
+        * doc-view.el (doc-view-current-cache-dir): Beware % escapes
+        (bug#13689).
+
+2013-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * cus-start.el (all): Remove inhibit-local-menu-bar-menus.
+
+2013-02-11  Glenn Morris  <rgm@gnu.org>
+
+        * vc/diff.el (diff-use-labels): New variable.
+        (diff-no-select): Use --label rather than -L, and first
+        check that it is supported.  (Bug#11067)
+
+        * files.el (enable-dir-local-variables): New variable.
+        (hack-dir-local-variables): Respect enable-dir-local-variables.
+        * tutorial.el (help-with-tutorial):
+        Ignore directory-local variables.  (Bug#11127)
+
+        * vc/vc-svn.el (vc-svn-command): Move --non-interactive from here...
+        (vc-svn-global-switches): ... to here.  (Bug#13513)
+
 2013-02-10  Christopher Schmidt  <christopher@ch.ristopher.com>
 
-        * minibuf-eldef.el (minibuffer-default--in-prompt-regexps): Handle
-        "foo (bar, default: xxx): " prompts.
+        * minibuf-eldef.el (minibuffer-default--in-prompt-regexps):
+        Handle "foo (bar, default: xxx): " prompts.
 
 2013-02-10  Chong Yidong  <cyd@gnu.org>
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2bc47426332..2e442b6c944 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -286,7 +286,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
              (double-click-time mouse (restricted-sexp
                                        :match-alternatives (integerp 'nil 't)))
              (double-click-fuzz mouse integer "22.1")
-             (inhibit-local-menu-bar-menus menu boolean)
              (help-char keyboard character)
              (help-event-list keyboard (repeat (sexp :format "%v")))
              (menu-prompting menu boolean)
@@ -301,15 +300,15 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                      (const :tag "When sent SIGUSR2" sigusr2))
                              "24.1")
 
-;; This is not good news because it will use the wrong
-;; version-specific directories when you upgrade.  We need
-;; customization of the front of the list, maintaining the standard
-;; value intact at the back.
-;;;          (load-path environment
-;;;                     (repeat (choice :tag "[Current dir?]"
-;;;                                     :format "%[Current dir?%] %v"
-;;;                                     (const :tag " current dir" nil)
-;;;                                     (directory :format "%v"))))
+             ;; This is not good news because it will use the wrong
+             ;; version-specific directories when you upgrade.  We need
+             ;; customization of the front of the list, maintaining the
+             ;; standard value intact at the back.
+             ;;(load-path environment
+             ;;         (repeat (choice :tag "[Current dir?]"
+             ;;                         :format "%[Current dir?%] %v"
+             ;;                         (const :tag " current dir" nil)
+             ;;                         (directory :format "%v"))))
              ;; minibuf.c
              (enable-recursive-minibuffers minibuffer boolean)
              (history-length minibuffer
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index e7d1ebc35ff..edd59a7b518 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -686,7 +686,8 @@ It's a subdirectory of `doc-view-cache-directory'."
     (setq doc-view-current-cache-dir
           (file-name-as-directory
            (expand-file-name
-            (concat (file-name-nondirectory doc-view-buffer-file-name)
+            (concat (subst-char-in-string ?% ?_ ;; bug#13679
+                     (file-name-nondirectory doc-view-buffer-file-name))
                     "-"
                     (let ((file doc-view-buffer-file-name))
                       (with-temp-buffer
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 7ca86b5ac95..1da838557f7 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -447,16 +447,24 @@ Use this defun with `erc-insert-modify-hook'."
                         (nth 0 (erc-parse-user nickuserhost))))
          (old-pt (point))
          (nick-beg (and nickname
-                        (re-search-forward (regexp-quote nickname)
+                        (re-search-forward "\\(\\* \\)?"(regexp-quote nickname)
                                            (point-max) t)
                         (match-beginning 0)))
          (nick-end (when nick-beg
                      (match-end 0)))
-         (message (buffer-substring (if (and nick-end
-                                             (<= (+ 2 nick-end) (point-max)))
-                                        (+ 2 nick-end)
-                                      (point-min))
-                                    (point-max))))
+         (message (buffer-substring
+                   (if (and nick-end
+                            (<= (+ 2 nick-end) (point-max)))
+                       (+ nick-end
+                          ;; Message starts 2 characters after the nick except
+                          ;; for CTCP ACTION messages.
+                          (if (string= "* "
+                                       (buffer-substring (- nick-beg 2)
+                                                         nick-beg))
+                              1
+                            2))
+                     (point-min))
+                   (point-max))))
     (when (and vector
                (not (and erc-match-exclude-server-buffer
                          (erc-server-buffer-p))))
diff --git a/lisp/files.el b/lisp/files.el
index c9e5d2763fe..890834d4af0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -507,6 +507,11 @@ and ignores this variable."
                  (other :tag "Query" other))
   :group 'find-file)
 
+(defvar enable-dir-local-variables t
+  "Non-nil means enable use of directory-local variables.
+Some modes may wish to set this to nil to prevent directory-local
+settings being applied, but still respect file-local ones.")
+
 ;; This is an odd variable IMO.
 ;; You might wonder why it is needed, when we could just do:
 ;; (set (make-local-variable 'enable-local-variables) nil)
@@ -3659,8 +3664,12 @@ is found.  Returns the new class name."
 (defun hack-dir-local-variables ()
   "Read per-directory local variables for the current buffer.
 Store the directory-local variables in `dir-local-variables-alist'
-and `file-local-variables-alist', without applying them."
+and `file-local-variables-alist', without applying them.
+
+This does nothing if either `enable-local-variables' or
+`enable-dir-local-variables' are nil."
   (when (and enable-local-variables
+             enable-dir-local-variables
              (or enable-remote-dir-locals
                  (not (file-remote-p (or (buffer-file-name)
                                          default-directory)))))
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index ea318ec3250..5e9ba6d9cea 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -5133,7 +5133,7 @@ Other orders of $ and _ seem to all work just fine.")
         (forward-line 1))
       ;; Would like to look for a "Total" line, or a "Directory" line to
       ;; make sure that the listing isn't complete garbage before putting
-      ;; in "." and "..", but we can't even count on all VAX's giving us
+      ;; in "." and "..", but we can't count on VMS giving us
       ;; either of these.
       (puthash "." t tbl)
       (puthash ".." t tbl))
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 011461119fc..39eb9e8b9aa 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -829,10 +829,9 @@ Run the Viper tutorial? "))
             (progn
               (insert-file-contents (tutorial--saved-file))
               (let ((enable-local-variables :safe)
-                    (enable-local-eval nil))
+                    (enable-local-eval nil)
+                    (enable-dir-local-variables nil)) ; bug#11127
                 (hack-local-variables))
-              ;; FIXME?  What we actually want is to ignore dir-locals (?).
-              (setq buffer-read-only nil) ; bug#11118
               (goto-char (point-min))
               (setq old-tut-point
                     (string-to-number
@@ -849,10 +848,9 @@ Run the Viper tutorial? "))
               (setq tutorial--point-before-chkeys (point-marker)))
           (insert-file-contents (expand-file-name filename tutorial-directory))
           (let ((enable-local-variables :safe)
-                (enable-local-eval nil))
+                (enable-local-eval nil)
+                (enable-dir-local-variables nil)) ; bug#11127
             (hack-local-variables))
-          ;; FIXME?  What we actually want is to ignore dir-locals (?).
-          (setq buffer-read-only nil) ; bug#11118
           (forward-line)
           (setq tutorial--point-before-chkeys (point-marker)))
 
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 8b4ff792969..0fc0d2e3f73 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -114,6 +114,13 @@ specified in the variable `diff-switches' are passed to the diff command."
           tempfile))
     (file-local-copy file-or-buf)))
 
+(defvar diff-use-labels 'check
+  "Whether `diff-command' understands the \"--label\" option.
+Possible values are:
+  t     -- yes, it does
+  nil   -- no, it does not
+  check -- try to probe whether it does")
+
 (defun diff-no-select (old new &optional switches no-async buf)
   ;; Noninteractive helper for creating and reverting diff buffers
   (unless (bufferp new) (setq new (expand-file-name new)))
@@ -121,6 +128,11 @@ specified in the variable `diff-switches' are passed to the diff command."
   (or switches (setq switches diff-switches)) ; If not specified, use default.
   (unless (listp switches) (setq switches (list switches)))
   (or buf (setq buf (get-buffer-create "*Diff*")))
+  (when (eq 'check diff-use-labels)
+    (setq diff-use-labels
+          (with-temp-buffer
+            (when (ignore-errors (call-process diff-command nil t nil "--help"))
+              (if (search-backward "--label" nil t) t)))))
   (let* ((old-alt (diff-file-local-copy old))
          (new-alt (diff-file-local-copy new))
          (command
@@ -130,11 +142,14 @@ specified in the variable `diff-switches' are passed to the diff command."
                        ,@switches
                        ,@(mapcar #'shell-quote-argument
                                  (nconc
-                                  (when (or old-alt new-alt)
-                                    (list "-L" (if (stringp old)
-                                                   old (prin1-to-string old))
-                                          "-L" (if (stringp new)
-                                                   new (prin1-to-string new))))
+                                  (and (or old-alt new-alt)
+                                       (eq diff-use-labels t)
+                                       (list "--label"
+                                             (if (stringp old) old
+                                               (prin1-to-string old))
+                                             "--label"
+                                             (if (stringp new) new
+                                               (prin1-to-string new))))
                                   (list (or old-alt old)
                                         (or new-alt new)))))
                      " "))
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index fcdd792a69b..923888b460b 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -50,14 +50,21 @@
   :type 'string
   :group 'vc-svn)
 
-(defcustom vc-svn-global-switches nil
-  "Global switches to pass to any SVN command."
+;; Might be nice if svn defaulted to non-interactive if stdin not tty.
+;; http://svn.haxx.se/dev/archive-2008-05/0762.shtml
+;; http://svn.haxx.se/dev/archive-2009-04/0094.shtml
+;; Maybe newer ones do?
+(defcustom vc-svn-global-switches (unless (eq system-type 'darwin) ; bug#13513
+                                    '("--non-interactive"))
+  "Global switches to pass to any SVN command.
+The option \"--non-interactive\" is often needed to prevent SVN
+hanging while prompting for authorization."
   :type '(choice (const :tag "None" nil)
                  (string :tag "Argument String")
                  (repeat :tag "Argument List"
                          :value ("")
                          string))
-  :version "22.1"
+  :version "24.4"
   :group 'vc-svn)
 
 (defcustom vc-svn-register-switches nil
@@ -600,19 +607,11 @@ NAME is assumed to be a URL."
 (defun vc-svn-command (buffer okstatus file-or-list &rest flags)
   "A wrapper around `vc-do-command' for use in vc-svn.el.
 The difference to vc-do-command is that this function always invokes `svn',
-and that it passes \"--non-interactive\" and `vc-svn-global-switches' to
-it before FLAGS."
-  ;; Might be nice if svn defaulted to non-interactive if stdin not tty.
-  ;; http://svn.haxx.se/dev/archive-2008-05/0762.shtml
-  ;; http://svn.haxx.se/dev/archive-2009-04/0094.shtml
-  ;; Maybe newer ones do?
-  (or (member "--non-interactive"
-              (setq flags (if (stringp vc-svn-global-switches)
-             (cons vc-svn-global-switches flags)
-                            (append vc-svn-global-switches flags))))
-      (setq flags (cons "--non-interactive" flags)))
+and that it passes `vc-svn-global-switches' to it before FLAGS."
   (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
-         flags))
+         (if (stringp vc-svn-global-switches)
+             (cons vc-svn-global-switches flags)
+           (append vc-svn-global-switches flags))))
 
 (defun vc-svn-repository-hostname (dirname)
   (with-temp-buffer