Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org

16 files changed, 179 insertions, 253 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 52c1f0c164a..0de3533c6c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,54 @@
+2014-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled
+        into autoloading just because of a silly indirection.
+
+2014-05-12  Santiago Payà i Miralta  <santiagopim@gmail.com>  (tiny change)
+
+        * vc/vc-hg.el (vc-hg-unregister): New function.  (Bug#17454)
+
+2014-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/find-gc.el: Move to ../admin.
+
+        * printing.el (pr-version):
+        * ps-print.el (ps-print-version): Also mention bug-gnu-emacs.
+
+        * net/browse-url.el (browse-url-mosaic):
+        Create /tmp/Mosaic.PID as a private file.
+
+2014-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/nadvice.el: Support adding a given function multiple times.
+        (advice--member-p): If name is given, only compare the name.
+        (advice--remove-function): Don't stop at the first match.
+        (advice--normalize-place): New function.
+        (add-function, remove-function): Use it.
+        (advice--add-function): Pass the name, if any, to
+        advice--remove-function.
+
+2014-05-12  Philipp Rumpf  <prumpf@gmail.com>  (tiny change)
+
+        * electric.el (electric-indent-post-self-insert-function): Don't use
+        `pos' after modifying the buffer (bug#17449).
+
+2014-05-12  Stephen Berman  <stephen.berman@gmx.net>
+
+        * calendar/todo-mode.el (todo-insert-item-from-calendar):
+        Correct argument list to conform to todo-insert-item--basic.
+
+2014-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (cd-absolute): Test if directory is accessible
+        rather than executable.  (Bug#17330)
+
+        * progmodes/compile.el (recompile):
+        Handle C-u M-x recompile from a non-compilation buffer.  (Bug#17444)
+
+        * net/browse-url.el (browse-url-mosaic):
+        Be careful when writing /tmp/Mosaic.PID.  (Bug#17428)
+        This is CVE-2014-3423.
+
 2014-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * mouse.el: Use the normal toplevel loop while dragging.
@@ -89,6 +140,7 @@
         (tramp-remote-coding-commands): Enhance docstring.
         (tramp-find-inline-encoding): Replace "%t" by a temporary file
         name.  (Bug#17415)
+        This is CVE-2014-3424.
 
 2014-05-08  Glenn Morris  <rgm@gnu.org>
 
@@ -96,6 +148,7 @@
         (find-gc-source-files): Update some names.
         (trace-call-tree): Simplify and update.
         Avoid predictable temp-file names.  (http://bugs.debian.org/747100)
+        This is CVE-2014-3422.
 
 2014-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 4f4aefa6317..f7f2b1d1539 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -1984,7 +1984,7 @@ prompt for a todo file and then for a category in it."
   (setq todo-date-from-calendar
         (calendar-date-string (calendar-cursor-to-date t) t t))
   (calendar-exit)
-  (todo-insert-item--basic arg nil nil todo-date-from-calendar))
+  (todo-insert-item--basic arg nil todo-date-from-calendar))
 
 (define-key calendar-mode-map "it" 'todo-insert-item-from-calendar)
 
diff --git a/lisp/electric.el b/lisp/electric.el
index e8ceaa6406c..bf73dbb256f 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -259,29 +259,30 @@ or comment."
                     (unless (eq act 'do-indent) (nth 8 (syntax-ppss))))))))
       ;; For newline, we want to reindent both lines and basically behave like
       ;; reindent-then-newline-and-indent (whose code we hence copied).
-      (when (<= pos (line-beginning-position))
-        (let ((before (copy-marker (1- pos) t)))
-          (save-excursion
-            (unless (or (memq indent-line-function
-                              electric-indent-functions-without-reindent)
-                        electric-indent-inhibit)
-              ;; Don't reindent the previous line if the indentation function
-              ;; is not a real one.
+      (let ((at-newline (<= pos (line-beginning-position))))
+        (when at-newline
+          (let ((before (copy-marker (1- pos) t)))
+            (save-excursion
+              (unless (or (memq indent-line-function
+                                electric-indent-functions-without-reindent)
+                          electric-indent-inhibit)
+                ;; Don't reindent the previous line if the indentation function
+                ;; is not a real one.
+                (goto-char before)
+                (indent-according-to-mode))
+              ;; We are at EOL before the call to indent-according-to-mode, and
+              ;; after it we usually are as well, but not always.  We tried to
+              ;; address it with `save-excursion' but that uses a normal marker
+              ;; whereas we need `move after insertion', so we do the
+              ;; save/restore by hand.
               (goto-char before)
-              (indent-according-to-mode))
-            ;; We are at EOL before the call to indent-according-to-mode, and
-            ;; after it we usually are as well, but not always.  We tried to
-            ;; address it with `save-excursion' but that uses a normal marker
-            ;; whereas we need `move after insertion', so we do the
-            ;; save/restore by hand.
-            (goto-char before)
-            (when (eolp)
-              ;; Remove the trailing whitespace after indentation because
-              ;; indentation may (re)introduce the whitespace.
-              (delete-horizontal-space t)))))
-      (unless (and electric-indent-inhibit
-                   (> pos (line-beginning-position)))
-        (indent-according-to-mode)))))
+              (when (eolp)
+                ;; Remove the trailing whitespace after indentation because
+                ;; indentation may (re)introduce the whitespace.
+                (delete-horizontal-space t)))))
+        (unless (and electric-indent-inhibit
+                     (not at-newline))
+          (indent-according-to-mode))))))
 
 (put 'electric-indent-post-self-insert-function 'priority  60)
 
diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el
deleted file mode 100644
index 83eb26e86d7..00000000000
--- a/lisp/emacs-lisp/find-gc.el
+++ /dev/null
@@ -1,149 +0,0 @@
-;;; find-gc.el --- detect functions that call the garbage collector
-
-;; Copyright (C) 1992, 2001-2014 Free Software Foundation, Inc.
-
-;; Maintainer: emacs-devel@gnu.org
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Produce in find-gc-unsafe-list the set of all functions that may invoke GC.
-;; This expects the Emacs sources to live in find-gc-source-directory.
-
-;;; Code:
-
-(defvar find-gc-unsafe-list nil
-  "The list of unsafe functions is placed here by `find-gc-unsafe'.")
-
-(defvar find-gc-source-directory
-  (file-name-as-directory (expand-file-name "src" source-directory))
-  "Directory containing Emacs C sources.")
-
-(defvar find-gc-subrs-callers nil
-  "Alist of users of subrs, from GC testing.
-Each entry has the form (FUNCTION . FUNCTIONS-THAT-CALL-IT).")
-
-(defvar find-gc-subrs-called nil
-  "Alist of subrs called, in GC testing.
-Each entry has the form (FUNCTION . FUNCTIONS-IT-CALLS).")
-
-
-;;; Functions on this list are safe, even if they appear to be able
-;;; to call the target.
-
-(defvar find-gc-noreturn-list '(Fsignal Fthrow wrong_type_argument))
-
-;;; This was originally generated directory-files, but there were
-;;; too many files there that were not actually compiled.  The
-;;; list below was created for a HP-UX 7.0 system.
-
-(defvar find-gc-source-files
-  '("dispnew.c" "scroll.c" "xdisp.c" "window.c"
-    "term.c" "cm.c" "emacs.c" "keyboard.c" "macros.c"
-    "keymap.c" "sysdep.c" "buffer.c" "filelock.c"
-    "insdel.c" "marker.c" "minibuf.c" "fileio.c"
-    "dired.c" "cmds.c" "casefiddle.c"
-    "indent.c" "search.c" "regex.c" "undo.c"
-    "alloc.c" "data.c" "doc.c" "editfns.c"
-    "callint.c" "eval.c" "fns.c" "print.c" "lread.c"
-    "syntax.c" "unexcoff.c"
-    "bytecode.c" "process.c" "callproc.c" "doprnt.c"
-    "xterm.c" "xfns.c"))
-
-
-(defun find-gc-unsafe ()
-  "Return a list of unsafe functions--that is, which can call GC.
-Also store it in `find-gc-unsafe-list'."
-  (trace-call-tree nil)
-  (trace-use-tree)
-  (find-unsafe-funcs 'Fgarbage_collect)
-  (setq find-gc-unsafe-list
-        (sort find-gc-unsafe-list
-              (function (lambda (x y)
-                          (string-lessp (car x) (car y)))))))
-
-;;; This does a depth-first search to find all functions that can
-;;; ultimately call the function "target".  The result is an a-list
-;;; in find-gc-unsafe-list; the cars are the unsafe functions, and the cdrs
-;;; are (one of) the unsafe functions that these functions directly
-;;; call.
-
-(defun find-unsafe-funcs (target)
-  (setq find-gc-unsafe-list (list (list target)))
-  (trace-unsafe target))
-
-(defun trace-unsafe (func)
-  (let ((used (assq func find-gc-subrs-callers)))
-    (or used
-        (error "No find-gc-subrs-callers for %s" (car find-gc-unsafe-list)))
-    (while (setq used (cdr used))
-      (or (assq (car used) find-gc-unsafe-list)
-          (memq (car used) find-gc-noreturn-list)
-          (progn
-            (push (cons (car used) func) find-gc-unsafe-list)
-            (trace-unsafe (car used)))))))
-
-
-
-
-(defun trace-call-tree (&optional ignored)
-  (message "Setting up directories...")
-  (setq find-gc-subrs-called nil)
-  (let ((case-fold-search nil)
-        (default-directory find-gc-source-directory)
-        (files find-gc-source-files)
-        name entry rtlfile)
-    (dolist (file files)
-      (message "Compiling %s..." file)
-      (call-process "gcc" nil nil nil "-I" "." "-I" "../lib"
-                    "-fdump-rtl-expand" "-o" null-device "-c" file)
-      (setq rtlfile
-            (file-expand-wildcards (format "%s.*.expand" file) t))
-      (if (/= 1 (length rtlfile))
-          (message "Error compiling `%s'?" file)
-        (with-temp-buffer
-          (insert-file-contents (setq rtlfile (car rtlfile)))
-          (delete-file rtlfile)
-          (while (re-search-forward ";; Function \\|(call_insn " nil t)
-            (if (= (char-after (- (point) 3)) ?o)
-                (progn
-                  (looking-at "[a-zA-Z0-9_]+")
-                  (setq name (intern (match-string 0)))
-                  (message "%s : %s" (car files) name)
-                  (setq entry (list name)
-                        find-gc-subrs-called
-                        (cons entry find-gc-subrs-called)))
-              (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
-                  (progn
-                    (setq name (intern (match-string 1)))
-                    (or (memq name (cdr entry))
-                        (setcdr entry (cons name (cdr entry)))))))))))))
-
-(defun trace-use-tree ()
-  (setq find-gc-subrs-callers (mapcar 'list (mapcar 'car find-gc-subrs-called)))
-  (let ((ptr find-gc-subrs-called)
-        p2 found)
-    (while ptr
-      (setq p2 (car ptr))
-      (while (setq p2 (cdr p2))
-        (if (setq found (assq (car p2) find-gc-subrs-callers))
-            (setcdr found (cons (car (car ptr)) (cdr found)))))
-      (setq ptr (cdr ptr)))))
-
-(provide 'find-gc)
-
-;;; find-gc.el ends here
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 0e2536f8179..01027c43148 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -134,7 +134,7 @@ Each element has the form (WHERE BYTECODE STACK) where:
 (defun advice--interactive-form (function)
   ;; Like `interactive-form' but tries to avoid autoloading functions.
   (when (commandp function)
-    (if (not (and (symbolp function) (autoloadp (symbol-function function))))
+    (if (not (and (symbolp function) (autoloadp (indirect-function function))))
         (interactive-form function)
       `(interactive (advice-eval-interactive-spec
                      (cadr (interactive-form ',function)))))))
@@ -183,9 +183,9 @@ WHERE is a symbol to select an entry in `advice--where-alist'."
 (defun advice--member-p (function name definition)
   (let ((found nil))
     (while (and (not found) (advice--p definition))
-      (if (or (equal function (advice--car definition))
-              (when name
-                (equal name (cdr (assq 'name (advice--props definition))))))
+      (if (if name
+              (equal name (cdr (assq 'name (advice--props definition))))
+            (equal function (advice--car definition)))
           (setq found definition)
         (setq definition (advice--cdr definition))))
     found))
@@ -209,8 +209,8 @@ WHERE is a symbol to select an entry in `advice--where-alist'."
                  (lambda (first rest props)
                    (cond ((not first) rest)
                          ((or (equal function first)
-                           (equal function (cdr (assq 'name props))))
-                          (list rest))))))
+                              (equal function (cdr (assq 'name props))))
+                          (list (advice--remove-function rest function)))))))
 
 (defvar advice--buffer-local-function-sample nil
   "keeps an example of the special \"run the default value\" functions.
@@ -232,6 +232,12 @@ different, but `function-equal' will hopefully ignore those differences.")
           ;; This function acts like the t special value in buffer-local hooks.
           (lambda (&rest args) (apply (default-value var) args)))))
 
+(defun advice--normalize-place (place)
+  (cond ((eq 'local (car-safe place)) `(advice--buffer-local ,@(cdr place)))
+        ((eq 'var (car-safe place))   (nth 1 place))
+        ((symbolp place)              `(default-value ',place))
+        (t place)))
+
 ;;;###autoload
 (defmacro add-function (where place function &optional props)
   ;; TODO:
@@ -267,8 +273,9 @@ a special meaning:
   the advice  should be innermost (i.e. at the end of the list),
   whereas a depth of -100 means that the advice should be outermost.
 
-If PLACE is a simple variable, only its global value will be affected.
-Use (local 'VAR) if you want to apply FUNCTION to VAR buffer-locally.
+If PLACE is a symbol, its `default-value' will be affected.
+Use (local 'SYMBOL) if you want to apply FUNCTION to SYMBOL buffer-locally.
+Use (var VAR) if you want to apply FUNCTION to the (lexical) VAR.
 
 If one of FUNCTION or OLDFUN is interactive, then the resulting function
 is also interactive.  There are 3 cases:
@@ -278,20 +285,18 @@ is also interactive.  There are 3 cases:
   `advice-eval-interactive-spec') and return the list of arguments to use.
 - Else, use the interactive spec of FUNCTION and ignore the one of OLDFUN."
   (declare (debug t)) ;;(indent 2)
-  (cond ((eq 'local (car-safe place))
-         (setq place `(advice--buffer-local ,@(cdr place))))
-        ((symbolp place)
-         (setq place `(default-value ',place))))
-  `(advice--add-function ,where (gv-ref ,place) ,function ,props))
+  `(advice--add-function ,where (gv-ref ,(advice--normalize-place place))
+                         ,function ,props))
 
 ;;;###autoload
 (defun advice--add-function (where ref function props)
-  (let ((a (advice--member-p function (cdr (assq 'name props))
-                             (gv-deref ref))))
+  (let* ((name (cdr (assq 'name props)))
+         (a (advice--member-p function name (gv-deref ref))))
     (when a
       ;; The advice is already present.  Remove the old one, first.
       (setf (gv-deref ref)
-            (advice--remove-function (gv-deref ref) (advice--car a))))
+            (advice--remove-function (gv-deref ref)
+                                     (or name (advice--car a)))))
     (setf (gv-deref ref)
           (advice--make where function (gv-deref ref) props))))
 
@@ -302,11 +307,7 @@ If FUNCTION was not added to PLACE, do nothing.
 Instead of FUNCTION being the actual function, it can also be the `name'
 of the piece of advice."
   (declare (debug t))
-  (cond ((eq 'local (car-safe place))
-         (setq place `(advice--buffer-local ,@(cdr place))))
-        ((symbolp place)
-         (setq place `(default-value ',place))))
-  (gv-letplace (getter setter) place
+  (gv-letplace (getter setter) (advice--normalize-place place)
     (macroexp-let2 nil new `(advice--remove-function ,getter ,function)
       `(unless (eq ,new ,getter) ,(funcall setter new)))))
 
diff --git a/lisp/files.el b/lisp/files.el
index 5487e27198a..cd2feb69610 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -685,7 +685,7 @@ nil (meaning `default-directory') as the associated list element."
       (if (file-exists-p dir)
           (error "%s is not a directory" dir)
         (error "%s: no such directory" dir))
-    (unless (file-executable-p dir)
+    (unless (file-accessible-directory-p dir)
       (error "Cannot cd to %s:  Permission denied" dir))
     (setq default-directory dir)
     (setq list-buffers-directory dir)))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c97ad7fc0a2..dad0444fcb2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -15,6 +15,7 @@
 
         * gnus-fun.el (gnus-grab-cam-face):
         Do not use predictable temp-file name.  (http://bugs.debian.org/747100)
+        This is CVE-2014-3421.
 
 2014-05-04  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 4364490f431..33f4eda9604 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1333,31 +1333,32 @@ used instead of `browse-url-new-window-flag'."
   (let ((pidfile (expand-file-name browse-url-mosaic-pidfile))
         pid)
     (if (file-readable-p pidfile)
-        (save-excursion
-          (find-file pidfile)
-          (goto-char (point-min))
-          (setq pid (read (current-buffer)))
-          (kill-buffer nil)))
-    (if (and pid (zerop (signal-process pid 0))) ; Mosaic running
-        (save-excursion
-          ;; This is a predictable temp-file name, which is bad,
-          ;; but it is what Mosaic uses/used.
-          ;; So it's not Emacs's problem.  http://bugs.debian.org/747100
-          (find-file (format "/tmp/Mosaic.%d" pid))
-          (erase-buffer)
-          (insert (if (browse-url-maybe-new-window new-window)
-                      "newwin\n"
-                    "goto\n")
-                  url "\n")
-          (save-buffer)
-          (kill-buffer nil)
+        (with-temp-buffer
+          (insert-file-contents pidfile)
+          (setq pid (read (current-buffer)))))
+    (if (and (integerp pid) (zerop (signal-process pid 0))) ; Mosaic running
+        (progn
+          (with-temp-buffer
+            (insert (if (browse-url-maybe-new-window new-window)
+                        "newwin\n"
+                      "goto\n")
+                    url "\n")
+            (let ((umask (default-file-modes)))
+              (unwind-protect
+                  (progn
+                    (set-default-file-modes ?\700)
+                    (if (file-exists-p
+                         (setq pidfile (format "/tmp/Mosaic.%d" pid)))
+                        (delete-file pidfile))
+                    ;; http://debbugs.gnu.org/17428.  Use O_EXCL.
+                    (write-region nil nil pidfile nil 'silent nil 'excl))
+                (set-default-file-modes umask))))
           ;; Send signal SIGUSR to Mosaic
           (message "Signaling Mosaic...")
           (signal-process pid 'SIGUSR1)
           ;; Or you could try:
           ;; (call-process "kill" nil 0 nil "-USR1" (int-to-string pid))
-          (message "Signaling Mosaic...done")
-          )
+          (message "Signaling Mosaic...done"))
       ;; Mosaic not running - start it
       (message "Starting %s..." browse-url-mosaic-program)
       (apply 'start-process "xmosaic" nil browse-url-mosaic-program
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index c1e3c9998d0..a74388b7d71 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-12  Eric Schulte  <eric.schulte@gmx.com>
+
+        * ob-screen.el (org-babel-screen-session-write-temp-file)
+        (org-babel-screen-test):
+        Use unpredictable names for temporary files.  (Bug#17416)
+
 2014-04-22  Aaron Ecay  <aaronecay@gmail.com>
 
         * org-src.el (org-edit-src-exit): Place an undo boundary before
@@ -286,7 +292,7 @@
 
 2014-04-22  Justin Gordon  <justin.gordon@gmail.com>
 
-        * ox-md (org-md-separate-elements): Fix blank line insertion
+        * ox-md.el (org-md-separate-elements): Fix blank line insertion
         between elements.
 
         * ox-md.el (org-md-inner-template): New function.
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index 2acbbeb7182..1d4ccdddf85 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -106,7 +106,7 @@ In case you want to use a different screen than one selected by your $PATH")
 
 (defun org-babel-screen-session-write-temp-file (session body)
   "Save BODY in a temp file that is named after SESSION."
-  (let ((tmpfile (concat "/tmp/screen.org-babel-session-" session)))
+  (let ((tmpfile (org-babel-temp-file "screen-")))
     (with-temp-file tmpfile
       (insert body)
 
@@ -121,7 +121,7 @@ The terminal should shortly flicker."
   (interactive)
   (let* ((session "org-babel-testing")
          (random-string (format "%s" (random 99999)))
-         (tmpfile "/tmp/org-babel-screen.test")
+         (tmpfile (org-babel-temp-file "ob-screen-test-"))
          (body (concat "echo '" random-string "' > " tmpfile "\nexit\n"))
          process tmp-string)
     (org-babel-execute:screen body org-babel-default-header-args:screen)
diff --git a/lisp/printing.el b/lisp/printing.el
index f24c0ab4297..0393746f8a5 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -12,7 +12,7 @@
   "printing.el, v 6.9.3 <2007/12/09 vinicius>
 
 Please send all bug fixes and enhancements to
-        Vinicius Jose Latorre <viniciusjl@ig.com.br>
+        bug-gnu-emacs@gnu.org and Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ")
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 146b9f8cb71..dd1fb78c1a2 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1460,7 +1460,7 @@ If optional second arg COMINT is t the buffer will be in Comint mode with
 `compilation-shell-minor-mode'.
 
 Interactively, prompts for the command if the variable
-`compilation-read-command' is non-nil; otherwise uses`compile-command'.
+`compilation-read-command' is non-nil; otherwise uses `compile-command'.
 With prefix arg, always prompts.
 Additionally, with universal prefix arg, compilation buffer will be in
 comint mode, i.e. interactive.
@@ -1499,12 +1499,13 @@ If the optional argument `edit-command' is non-nil, the command can be edited."
   (interactive "P")
   (save-some-buffers (not compilation-ask-about-save)
                      compilation-save-buffers-predicate)
-  (let ((default-directory (or compilation-directory default-directory)))
+  (let ((default-directory (or compilation-directory default-directory))
+        (command (eval compile-command)))
     (when edit-command
-      (setcar compilation-arguments
-              (compilation-read-command (car compilation-arguments))))
-    (apply 'compilation-start (or compilation-arguments
-                                  `(,(eval compile-command))))))
+      (setq command (compilation-read-command (or (car compilation-arguments)
+                                                  command)))
+      (if compilation-arguments (setcar compilation-arguments command)))
+    (apply 'compilation-start (or compilation-arguments (list command)))))
 
 (defcustom compilation-scroll-output nil
   "Non-nil to scroll the *compilation* buffer window as output appears.
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 004bdce1f6a..83f2cde4010 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -20,7 +20,7 @@ Emacs without changes to the version number.  When reporting bugs, please also
 report the version of Emacs, if any, that ps-print was distributed with.
 
 Please send all bug fixes and enhancements to
-        Vinicius Jose Latorre <viniciusjl@ig.com.br>.")
+        bug-gnu-emacs@gnu.org and Vinicius Jose Latorre <viniciusjl@ig.com.br>.")
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index f3426656038..aba4a2c53e8 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-12  Michael Albinus  <michael.albinus@gmx.de>
+
+        * url-handlers.el (url-file-handler-load-in-progress): New defvar.
+        (url-file-handler): Use it, in order to avoid recursive load.
+
 2014-05-04  Glenn Morris  <rgm@gnu.org>
 
         * url-parse.el (url-generic-parse-url): Doc fix (replace `iff').
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 9a05746ebff..c86acb680d0 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -138,34 +138,41 @@ like URLs \(Gnus is particularly bad at this\)."
         (inhibit-file-name-operation operation))
     (apply operation args)))
 
+(defvar url-file-handler-load-in-progress nil
+  "Check for recursive load.")
+
 ;;;###autoload
 (defun url-file-handler (operation &rest args)
   "Function called from the `file-name-handler-alist' routines.
 OPERATION is what needs to be done (`file-exists-p', etc).  ARGS are
 the arguments that would have been passed to OPERATION."
-  ;; Check, whether there are arguments we want pass to Tramp.
-  (if (catch :do
-        (dolist (url (cons default-directory args))
-          (and (member
-                (url-type (url-generic-parse-url (and (stringp url) url)))
-                url-tramp-protocols)
-               (throw :do t))))
-      (apply 'url-tramp-file-handler operation args)
-    ;; Otherwise, let's do the job.
-    (let ((fn (get operation 'url-file-handlers))
-          (val nil)
-          (hooked nil))
-      (if (and (not fn) (intern-soft (format "url-%s" operation))
-               (fboundp (intern-soft (format "url-%s" operation))))
-          (error "Missing URL handler mapping for %s" operation))
-      (if fn
-          (setq hooked t
-                val (save-match-data (apply fn args)))
-        (setq hooked nil
-              val (url-run-real-handler operation args)))
-      (url-debug 'handlers "%s %S%S => %S" (if hooked "Hooked" "Real")
-                 operation args val)
-      val)))
+  ;; Avoid recursive load.
+  (if (and load-in-progress url-file-handler-load-in-progress)
+      (url-run-real-handler operation args)
+    (let ((url-file-handler-load-in-progress load-in-progress))
+      ;; Check, whether there are arguments we want pass to Tramp.
+      (if (catch :do
+            (dolist (url (cons default-directory args))
+              (and (member
+                    (url-type (url-generic-parse-url (and (stringp url) url)))
+                    url-tramp-protocols)
+                   (throw :do t))))
+          (apply 'url-tramp-file-handler operation args)
+        ;; Otherwise, let's do the job.
+        (let ((fn (get operation 'url-file-handlers))
+              (val nil)
+              (hooked nil))
+          (if (and (not fn) (intern-soft (format "url-%s" operation))
+                   (fboundp (intern-soft (format "url-%s" operation))))
+              (error "Missing URL handler mapping for %s" operation))
+          (if fn
+              (setq hooked t
+                    val (save-match-data (apply fn args)))
+            (setq hooked nil
+                  val (url-run-real-handler operation args)))
+          (url-debug 'handlers "%s %S%S => %S" (if hooked "Hooked" "Real")
+                     operation args val)
+          val)))))
 
 (defun url-file-handler-identity (&rest args)
   ;; Identity function
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index a53ed8758c4..05b53a3eeb6 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -60,7 +60,7 @@
 ;; - responsible-p (file)                      OK
 ;; - could-register (file)                     OK
 ;; - receive-file (file rev)                   ?? PROBABLY NOT NEEDED
-;; - unregister (file)                         COMMENTED OUT, MAY BE INCORRECT
+;; - unregister (file)                         OK
 ;; * checkin (files rev comment)               OK
 ;; * find-revision (file rev buffer)           OK
 ;; * checkout (file &optional editable rev)    OK
@@ -436,10 +436,9 @@ COMMENT is ignored."
              ;; registered.
          (error))))
 
-;; FIXME: This would remove the file. Is that correct?
-;; (defun vc-hg-unregister (file)
-;;   "Unregister FILE from hg."
-;;   (vc-hg-command nil nil file "remove"))
+(defun vc-hg-unregister (file)
+  "Unregister FILE from hg."
+  (vc-hg-command nil 0 file "forget"))
 
 (declare-function log-edit-extract-headers "log-edit" (headers string))