Merge from mainline.

40 files changed, 814 insertions, 563 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29cd88a9186..f27a6fa1945 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,168 @@
+2013-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.el (frame-notice-user-settings): Avoid inflooping when the
+        initial frame is minibuffer-less.  (Bug#14841)
+
+2013-07-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-use-ssh-controlmaster-options): New customer
+        option.
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
+        (tramp-maybe-open-connection): Use it.
+
+2013-07-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop--make-frame): Include `minibuffer' in the
+        minimal set of parameters passed when creating a frame, because
+        the minibuffer status of a frame cannot be changed later.
+
+2013-07-28  Stephen Berman  <stephen.berman@gmx.net>
+
+        * calendar/todo-mode.el (todo-rename-file): Fix incorrect use of
+        replace-regexp-in-string and inadvertent omissions in previous change.
+        (todo-filter-items): Ensure only file names are comma-separated in
+        name of filtered items buffer.
+
+2013-07-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el: Optionally force offscreen frames back onscreen.
+        (desktop-restoring-reuses-frames): New option.
+        (desktop--compute-pos, desktop--move-onscreen): New functions.
+        (desktop--make-frame): Use desktop--move-onscreen.
+
+2013-07-27  Alan Mackenzie  <acm@muc.de>
+
+        Fontify a Java generic method as a function.
+        * progmodes/cc-langs.el (c-recognize-<>-arglists): Set the Java
+        value to t.
+
+2013-07-27  Stephen Berman  <stephen.berman@gmx.net>
+
+        * calendar/todo-mode.el: Add command to rename todo files.
+        (todo-rename-file): New command.
+        (todo-key-bindings-t): Add key binding for it.  Change the
+        bindings of todo-filter-regexp-items(-multifile) to use `x'
+        instead of `r', since the latter is better suited to the new
+        renaming command.
+
+2013-07-27  Alan Mackenzie  <acm@muc.de>
+
+        Make Java try-with-resources statement parse properly.
+        * progmodes/cc-langs.el (c-block-stmt-1-2-kwds)
+        (c-block-stmt-1-2-key): New language constants/variables.
+        * progmodes/cc-engine.el (c-beginning-of-statement-1)
+        (c-after-conditional): Adapt to deal with c-block-stmt-1-2-key.
+        * progmodes/cc-fonts.el (c-font-lock-declarations): Adapt to deal
+        with c-block-stmet-1-2-key.
+
+2013-07-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop--make-frame): Apply most frame parameters after
+        creating the frame to force (partially or totally) offscreen frames to
+        be restored as such.
+
+2013-07-26  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * vc/vc-dir.el (vc-dir-mode-map): Add binding for vc-root-diff.
+        (Bug#14948)
+
+2013-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/nadvice.el (advice--called-interactively-skip): Use the new
+        `base' arg of backtrace-frame.
+
+2013-07-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (list-processes): Doc fix.
+
+2013-07-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop--select-frame):
+        Try harder to reuse existing frames.
+
+2013-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/edebug.el: Use backtrace-eval to handle lexical variables.
+        (edebug-eval): Use backtrace-eval.
+        (edebug--display, edebug--recursive-edit): Don't let-bind the
+        edebug-outer-* vars that keep track of variables we locally let-bind.
+        (edebug-outside-excursion): Don't restore outside values of locally
+        let-bound vars.
+        (edebug--display): Use user-error.
+        (cl-lexical-debug, cl-debug-env): Remove.
+
+2013-07-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-restore-frames): Call `sit-for' once all frames
+        are restored to be sure that they are visible before deleting any
+        remaining ones.
+
+2013-07-26  Matthias Meulien  <orontee@gmail.com>
+
+        * vc/vc-dir.el (vc-dir-mode-map): Add binding for
+        vc-print-root-log.  (Bug#14948)
+
+2013-07-26  Richard Stallman  <rms@gnu.org>
+
+        Add aliases for encrypting mail.
+        * epa.el (epa-mail-aliases): New option.
+        * epa-mail.el (epa-mail-encrypt): Rewrite to be callable from programs.
+        Bind inhibit-read-only so read-only text doesn't ruin everything.
+        (epa-mail-default-recipients): New subroutine broken out.
+        Handle epa-mail-aliases.
+
+2013-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Add support for lexical variables to the debugger's `e' command.
+        * emacs-lisp/debug.el (debug): Don't let-bind the debugger-outer-*
+        vars, except for debugger-outer-match-data.
+        (debugger-frame-number): Move check for "on a function call" from
+        callers into it.  Add `skip-base' argument.
+        (debugger-frame, debugger-frame-clear): Simplify accordingly.
+        (debugger-env-macro): Only reset the state stored in non-variables,
+        i.e. current-buffer and match-data.
+        (debugger-eval-expression): Rewrite using backtrace-eval.
+        * subr.el (internal--called-interactively-p--get-frame): Remove.
+        (called-interactively-p):
+        * emacs-lisp/edebug.el (edebug--called-interactively-skip): Use the new
+        `base' arg of backtrace-frame instead.
+
+2013-07-26  Glenn Morris  <rgm@gnu.org>
+
+        * align.el (align-regexp): Doc fix.  (Bug#14857)
+        (align-region): Explicit error if subexpression missing/does not match.
+
+        * simple.el (global-visual-line-mode):
+        Do not duplicate the mode lighter.  (Bug#14858)
+
+2013-07-25  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer): In display-buffer bind
+        split-window-keep-point to t, bug#14829.
+
+2013-07-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el: Rename internal "desktop-X" frame params to "desktop--X".
+        (desktop-filter-parameters-alist, desktop--filter-restore-desktop-parm)
+        (desktop--filter-save-desktop-parm, desktop--process-minibuffer-frames)
+        (desktop--select-frame, desktop--sort-states, desktop-restore-frames):
+        Change accordingly.
+        (desktop--select-frame, desktop--sort-states, desktop-restore-frames):
+        Use pcase-let, pcase-let* to deobfuscate access to desktop--mini values.
+
+2013-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * dired-x.el (dired-mark-extension): Convert comment to doc string.
+
+2013-07-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop--make-frame): Do not pass the `fullscreen'
+        parameter to modify-frame-parameters if the value has not changed;
+        this is a workaround for bug#14949.
+        (desktop--make-frame): On cl-delete-if call, check parameter name,
+        not full parameter.
+
 2013-07-30  Xue Fuqiao  <xfq.free@gmail.com>
 
         * vc/vc.el (vc-ignore): New function.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 2d331a2819d..30afe9ce970 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -5182,7 +5182,7 @@
         inserted.
         (Info-hide-note-references): Fix doc and customize type.
 
-2003-03-02  Matt Swift  <swift@alum.mit.edu>
+2003-03-02  Matthew Swift  <swift@alum.mit.edu>
 
         * emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column):
         New custom variable.
@@ -5228,7 +5228,7 @@
         (tramp-send-region): Correct debug message.
         (tramp-bug): Add `tramp-chunksize'.
 
-2003-02-26  Matt Swift  <swift@alum.mit.edu>
+2003-02-26  Matthew Swift  <swift@alum.mit.edu>
 
         * startup.el: Streamline code in several functions for efficiency
         and readability.  Rephrase booleans to avoid `(not noninteractive)'.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 4d0ff9a40e2..afa2bce104e 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -5119,7 +5119,7 @@
         (x-setup-function-keys, xw-defined-colors): Merge x- and w32-
         definitions here.
 
-2010-10-24  T.V. Raman  <tv.raman.tv@gmail.com>  (tiny change)
+2010-10-24  T. V. Raman  <tv.raman.tv@gmail.com>  (tiny change)
 
         * net/mairix.el (mairix-searches-mode-map):
         * mail/mspools.el (mspools-mode-map): Fix 2010-10-10 change.
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index d6d1bac43c2..7692a0fffa8 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -4569,7 +4569,7 @@
         * bookmark.el (bookmark-completing-read): Set the completion category
         to `bookmark' (bug#11131).
 
-2012-10-26  Bastien  <bzg@altern.org>
+2012-10-26  Bastien Guerry  <bzg@altern.org>
             Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * face-remap.el: Use lexical-binding.
@@ -9712,7 +9712,7 @@
         * international/mule-cmds.el (mule-menu-keymap)
         (set-language-environment, set-locale-environment): Doc tweaks.
 
-2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
+2012-06-16  Aurélien Aptel  <aurelien.aptel@gmail.com>
 
         * cus-face.el (custom-face-attributes): Add wave-style underline
         attribute.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 4eec1795789..f52fdd7e194 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -7617,7 +7617,7 @@
         Delete the binding for toggle-enable-multibyte-characters.
         (mule-menu-keymap): Delete the menu item for it.
 
-1997-12-17  Peter Galbraith  <galbraith@mixing.qc.dfo.ca>
+1997-12-17  Peter S Galbraith  <galbraith@mixing.qc.dfo.ca>
 
         * simple.el (copy-region-as-kill):
         Deactivate mark in transient-mark-mode.
@@ -19637,7 +19637,7 @@
 
         * term/x-win.el (function-key-map): Define iso-lefttab.
 
-1997-03-24  Vince Del Vecchio  <vdelvecc@spd.analog.com>
+1997-03-24  Vincent Del Vecchio  <vdelvecc@spd.analog.com>
 
         * mh-utils.el (mh-find-progs): When looking for mh-lib, construct
         likely paths based on mh-progs rather than using a static list.
diff --git a/lisp/align.el b/lisp/align.el
index 1b62042be75..3d2ca192245 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -906,15 +906,8 @@ on the format of these lists."
 ;;;###autoload
 (defun align-regexp (beg end regexp &optional group spacing repeat)
   "Align the current region using an ad-hoc rule read from the minibuffer.
-BEG and END mark the limits of the region.  This function will prompt
-for the REGEXP to align with.  If no prefix arg was specified, you
-only need to supply the characters to be lined up and any preceding
-whitespace is replaced.  If a prefix arg was specified, the full
-regexp with parenthesized whitespace should be supplied; it will also
-prompt for which parenthesis GROUP within REGEXP to modify, the amount
-of SPACING to use, and whether or not to REPEAT the rule throughout
-the line.  See `align-rules-list' for more information about these
-options.
+BEG and END mark the limits of the region.  Interactively, this function
+prompts for the regular expression REGEXP to align with.
 
 For example, let's say you had a list of phone numbers, and wanted to
 align them so that the opening parentheses would line up:
@@ -925,8 +918,29 @@ align them so that the opening parentheses would line up:
     Joe (123) 456-7890
 
 There is no predefined rule to handle this, but you could easily do it
-using a REGEXP like \"(\".  All you would have to do is to mark the
-region, call `align-regexp' and type in that regular expression."
+using a REGEXP like \"(\".  Interactively, all you would have to do is
+to mark the region, call `align-regexp' and enter that regular expression.
+
+REGEXP must contain at least one parenthesized subexpression, typically
+whitespace of the form \"\\\\(\\\\s-*\\\\)\".  In normal interactive use,
+this is automatically added to the start of your regular expression after
+you enter it.  You only need to supply the characters to be lined up, and
+any preceding whitespace is replaced.
+
+If you specify a prefix argument (or use this function non-interactively),
+you must enter the full regular expression, including the subexpression.
+The function also then prompts for which subexpression parenthesis GROUP
+\(default 1) within REGEXP to modify, the amount of SPACING (default
+`align-default-spacing') to use, and whether or not to REPEAT the rule
+throughout the line.
+
+See `align-rules-list' for more information about these options.
+
+The non-interactive form of the previous example would look something like:
+  \(align-regexp (point-min) (point-max) \"\\\\(\\\\s-*\\\\)(\")
+
+This function is a nothing more than a small wrapper that helps you
+construct a rule to pass to `align-region', which does the real work."
   (interactive
    (append
     (list (region-beginning) (region-end))
@@ -1498,6 +1512,9 @@ aligner would have dealt with are."
                         (setq rule-beg (match-beginning first)
                               save-match-data (match-data))
 
+                        (or rule-beg
+                            (error "No match for subexpression %s" first))
+
                         ;; unless the `valid' attribute is set, and tells
                         ;; us that the rule is not valid at this point in
                         ;; the code..
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 934dfb92a57..943aa8b34b5 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -1099,6 +1099,52 @@ Noninteractively, return the name of the new file."
           (todo-show))
       file)))
 
+(defun todo-rename-file (&optional arg)
+  "Rename the current todo file.
+With prefix ARG, prompt for a todo file and rename it.
+If there are corresponding archive or filtered items files,
+rename these accordingly.  If there are live buffers visiting
+these files, also rename them accordingly."
+  (interactive "P")
+  (let* ((oname (or (and arg
+                         (todo-read-file-name "Choose a file to rename: "
+                                              nil t))
+                    (buffer-file-name)))
+         (soname (todo-short-file-name oname))
+         (nname (todo-read-file-name "New name for this file: "))
+         (snname (todo-short-file-name nname))
+         (files (directory-files todo-directory t
+                                 (concat ".*" (regexp-quote soname)
+                                         ".*\.tod[aorty]$") t)))
+    (dolist (f files)
+      (let* ((sfname (todo-short-file-name f))
+             (fext (file-name-extension f t))
+             (fbuf (find-buffer-visiting f))
+             (fbname (buffer-name fbuf)))
+        (when (string-match (regexp-quote soname) sfname)
+          (let* ((snfname (replace-match snname t t sfname))
+                 (nfname (concat todo-directory snfname fext)))
+            (rename-file f nfname)
+            (when fbuf
+              (with-current-buffer fbuf
+                (set-visited-file-name nfname t t)
+                (cond ((member fext '(".todo" ".toda"))
+                       (setq todo-current-todo-file (buffer-file-name))
+                       (setq mode-line-buffer-identification
+                             (funcall todo-mode-line-function
+                                      (todo-current-category))))
+                      (t
+                       (rename-buffer
+                        (replace-regexp-in-string
+                         (regexp-quote soname) snname fbname))))))))))
+    (setq todo-files (funcall todo-files-function)
+          todo-archives (funcall todo-files-function t))
+    (when (string= todo-default-todo-file soname)
+      (setq todo-default-todo-file snname))
+    (when (string= todo-global-current-todo-file oname)
+      (setq todo-global-current-todo-file nname))
+    (todo-reevaluate-filelist-defcustoms)))
+
 (defun todo-delete-file ()
   "Delete the current todo, archive or filtered items file.
 If the todo file has a corresponding archive file, or vice versa,
@@ -4121,7 +4167,8 @@ multifile commands for further details."
                                 (regexp ".todr")))))
          (rxfiles (when regexp
                     (directory-files todo-directory t ".*\\.todr$" t)))
-         (file-exists (or (file-exists-p fname) rxfiles)))
+         (file-exists (or (file-exists-p fname) rxfiles))
+         bufname)
     (cond ((and top new (natnump new))
            (todo-filter-items-1 (cons 'top new) flist))
           ((and (not new) file-exists)
@@ -4135,10 +4182,15 @@ multifile commands for further details."
            (todo-check-filtered-items-file))
           (t
            (todo-filter-items-1 filter flist)))
-    (setq fname (replace-regexp-in-string "-" ", "
-                                          (todo-short-file-name fname)))
+    (dolist (s (split-string (todo-short-file-name fname) "-"))
+      (setq bufname (if bufname
+                        (concat bufname (if (member s (mapcar
+                                                       'todo-short-file-name
+                                                       todo-files))
+                                            ", " "-") s)
+                      s)))
     (rename-buffer (format (concat "%s for file" (if multi "s" "")
-                                   " \"%s\"") buf fname))))
+                                   " \"%s\"") buf bufname))))
 
 (defun todo-filter-items-1 (filter file-list)
   "Build a list of items by applying FILTER to FILE-LIST.
@@ -6163,6 +6215,7 @@ Filtered Items mode following todo (not done) items."
     ("Cey"           todo-edit-category-diary-inclusion)
     ("Cek"           todo-edit-category-diary-nonmarking)
     ("Fa"            todo-add-file)
+    ("Fr"            todo-rename-file)
     ("Ff"            todo-find-filtered-items-file)
     ("FV"            todo-toggle-view-done-only)
     ("V"             todo-toggle-view-done-only)
@@ -6171,8 +6224,8 @@ Filtered Items mode following todo (not done) items."
     ("Fts"           todo-set-top-priorities-in-file)
     ("Fyy"           todo-filter-diary-items)
     ("Fym"           todo-filter-diary-items-multifile)
-    ("Frr"           todo-filter-regexp-items)
-    ("Frm"           todo-filter-regexp-items-multifile)
+    ("Fxx"           todo-filter-regexp-items)
+    ("Fxm"           todo-filter-regexp-items-multifile)
     ("ee"            todo-edit-item)
     ("em"            todo-edit-multiline-item)
     ("edt"           todo-edit-item-header)
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 705277c97a0..c39a8a700ef 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,38 @@
+2013-07-29  David Engster <deng@randomsample.de>
+
+        * lisp/cedet/cedet.el (cedet-packages): Remove speedbar since its
+        development does no longer happens in CEDET upstream but in Emacs
+        proper.  Also remove cedet-contrib and cogre since those are only
+        in upstream.
+
+        * semantic/analyze/fcn.el (semantic-analyze-type-to-name): If TYPE
+        has a parent, return a fully qualified name.
+
+        * semantic/decorate/mode.el
+        (semantic-decoration-on-includes-p-default)
+        (semantic-decoration-on-includes-highlight-default): Declare for
+        byte compiler.
+
+        * semantic/wisent/python.el (semantic/format): New require.
+
+2013-07-27  Eric Ludlam <zappo@gnu.org>
+
+        * lisp/cedet/semantic/edit.el (semantic-edits-splice-remove): Wrap
+        debug message removing middle tag in semantic-edits-verbose-flag
+        check.
+
+2013-07-27  David Engster <deng@randomsample.de>
+
+        * semantic/bovine/el.el (semantic/db-el): New require.
+
+        * semantic/db-el.el (semanticdb-normalize-one-tag): It might be
+        that a symbol comes from a file but cannot be found in its table.
+        This happens for instance when a symbol was dynamically created
+        through a macro like `defstruct'.  In this case, return the
+        original tag.
+        (semanticdb-elisp-sym->tag): Deal with autoloaded functions, where
+        the argument list is not available until the file is loaded.
+
 2013-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * data-debug.el, cedet-idutils.el: Neuter the "Version:" header.
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index e8720bc6624..f34442996c1 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -46,9 +46,6 @@
     (semantic      "2.2"           nil       "semantic/doc")
     (srecode       "1.2"           nil       "srecode"     )
     (ede           "1.2"           nil       "ede"         )
-    (speedbar      "1.0.4"         nil       "speedbar"    )
-    (cogre         "1.2"           nil       "cogre"       )
-    (cedet-contrib "1.2"           "contrib" nil           )
     )
   "Table of CEDET packages to install.")
 
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index 4300c89c9df..7512b7ca15a 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -165,7 +165,10 @@ SCOPE is the scope object with additional items in which to search for names."
 The TYPE field in a tag can be nil (return nil)
 or a string, or a non-positional tag."
   (cond ((semantic-tag-p type)
-         (semantic-tag-name type))
+         (if (semantic-tag-named-parent type)
+             (semantic-analyze-unsplit-name `(,(semantic-tag-named-parent type)
+                                              ,(semantic-tag-name type)))
+           (semantic-tag-name type)))
         ((stringp type)
          type)
         ((listp type)
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 0bbe3c61d76..c6f1ceb0f94 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -25,6 +25,7 @@
 
 (require 'semantic)
 (require 'semantic/bovine)
+(require 'semantic/db-el)
 (require 'find-func)
 
 (require 'semantic/ctxt)
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 1b0f3292ad3..3376389c7d5 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -173,13 +173,17 @@ If Emacs cannot resolve this symbol to a particular file, then return nil."
              (newtags (when tab (semanticdb-find-tags-by-name-method
                                  tab (semantic-tag-name tag))))
              (match nil))
-        ;; Find the best match.
-        (dolist (T newtags)
-          (when (semantic-tag-similar-p T tag)
-            (setq match T)))
-        ;; Backup system.
-        (when (not match)
-            (setq match (car newtags)))
+        ;; We might not have a parsed tag in this file, because it
+        ;; might be generated through a macro like defstruct.
+        (if (null newtags)
+            (setq match tag)
+          ;; Find the best match.
+          (dolist (T newtags)
+            (when (semantic-tag-similar-p T tag)
+              (setq match T)))
+          ;; Backup system.
+          (when (not match)
+            (setq match (car newtags))))
         ;; Return it.
         (when tab (cons tab match))))))
 
@@ -196,15 +200,18 @@ TOKTYPE is a hint to the type of tag desired."
   (when sym
     (cond ((and (eq toktype 'function) (fboundp sym))
            (require 'semantic/bovine/el)
-           (semantic-tag-new-function
-            (symbol-name sym)
-            nil ;; return type
-            (semantic-elisp-desymbolify
-             (help-function-arglist sym)) ;; arg-list
-            :user-visible-flag (condition-case nil
-                                   (interactive-form sym)
-                                 (error nil))
-            ))
+           (let ((arglist (help-function-arglist sym)))
+             (when (not (listp arglist))
+               ;; Function might be autoloaded, in which case
+               ;; the arglist is not available yet.
+               (setq arglist nil))
+             (semantic-tag-new-function
+              (symbol-name sym)
+              nil       ;; return type
+              (semantic-elisp-desymbolify arglist)
+              :user-visible-flag (condition-case nil
+                                     (interactive-form sym)
+                                   (error nil)))))
           ((and (eq toktype 'variable) (boundp sym))
            (semantic-tag-new-variable
             (symbol-name sym)
diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el
index ba06c73936b..cc5e9d9bec2 100644
--- a/lisp/cedet/semantic/decorate/mode.el
+++ b/lisp/cedet/semantic/decorate/mode.el
@@ -541,6 +541,10 @@ Use a primary decoration."
 
 ;;; Decoration Modes in other files
 ;;
+(declare-function semantic-decoration-on-includes-p-default
+                  "semantic/decorate/include")
+(declare-function semantic-decoration-on-includes-highlight-default
+                  "semantic/decorate/include")
 (define-semantic-decoration-style semantic-decoration-on-includes
   "Highlight class members that are includes.
 This mode provides a nice context menu on the include statements."
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index a27eab5404c..91455cdb741 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -882,8 +882,9 @@ pre-positioned to a convenient location."
             ;; reparse
             (semantic-parse-changes-failed "Splice-remove failed.  Empty buffer?")
             ))
-      (message "To Remove Middle Tag: (%s)"
-               (semantic-format-tag-name first)))
+      (when semantic-edits-verbose-flag
+        (message "To Remove Middle Tag: (%s)"
+                 (semantic-format-tag-name first))))
     ;; Find in the cache the preceding tag
     (while (and cachestart (not (eq first (car (cdr cachestart)))))
       (setq cachestart (cdr cachestart)))
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 719868f7635..2c0ed5868ce 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -39,6 +39,7 @@
 (require 'semantic/find)
 (require 'semantic/dep)
 (require 'semantic/ctxt)
+(require 'semantic/format)
 
 (eval-when-compile
   (require 'cl))
diff --git a/lisp/desktop.el b/lisp/desktop.el
index f4622ae4961..299bdc0eeb4 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -387,6 +387,18 @@ If `delete', frames on other displays are deleted instead of restored."
   :group 'desktop
   :version "24.4")
 
+(defcustom desktop-restore-forces-onscreen t
+  "If t, offscreen frames are restored onscreen instead.
+If `all', frames that are partially offscreen are also forced onscren.
+NOTE: Checking of frame boundaries is only approximate and can fail
+to reliably detect frames whose onscreen/offscreen state depends on a
+few pixels, especially near the right / bottom borders of the screen."
+  :type '(choice (const :tag "Only fully offscreen frames" t)
+                 (const :tag "Also partially offscreen frames" 'all)
+                 (const :tag "Do not force frames onscreen" nil))
+  :group 'desktop
+  :version "24.4")
+
 (defcustom desktop-restoring-reuses-frames t
   "If t, restoring frames reuses existing frames.
 If nil, existing frames are deleted.
@@ -878,30 +890,30 @@ DIRNAME must be the directory in which the desktop file will be saved."
 
 ;; ----------------------------------------------------------------------------
 (defvar desktop-filter-parameters-alist
-  '((background-color   . desktop--filter-*-color)
-    (buffer-list        . t)
-    (buffer-predicate   . t)
-    (buried-buffer-list . t)
-    (desktop-font       . desktop--filter-restore-desktop-parm)
-    (desktop-fullscreen . desktop--filter-restore-desktop-parm)
-    (desktop-height     . desktop--filter-restore-desktop-parm)
-    (desktop-width      . desktop--filter-restore-desktop-parm)
-    (font               . desktop--filter-save-desktop-parm)
-    (font-backend       . t)
-    (foreground-color   . desktop--filter-*-color)
-    (fullscreen         . desktop--filter-save-desktop-parm)
-    (height             . desktop--filter-save-desktop-parm)
-    (left               . desktop--filter-iconified-position)
-    (minibuffer         . desktop--filter-minibuffer)
-    (name               . t)
-    (outer-window-id    . t)
-    (parent-id          . t)
-    (top                . desktop--filter-iconified-position)
-    (tty                . desktop--filter-tty*)
-    (tty-type           . desktop--filter-tty*)
-    (width              . desktop--filter-save-desktop-parm)
-    (window-id          . t)
-    (window-system      . t))
+  '((background-color    . desktop--filter-*-color)
+    (buffer-list         . t)
+    (buffer-predicate    . t)
+    (buried-buffer-list  . t)
+    (desktop--font       . desktop--filter-restore-desktop-parm)
+    (desktop--fullscreen . desktop--filter-restore-desktop-parm)
+    (desktop--height     . desktop--filter-restore-desktop-parm)
+    (desktop--width      . desktop--filter-restore-desktop-parm)
+    (font                . desktop--filter-save-desktop-parm)
+    (font-backend        . t)
+    (foreground-color    . desktop--filter-*-color)
+    (fullscreen          . desktop--filter-save-desktop-parm)
+    (height              . desktop--filter-save-desktop-parm)
+    (left                . desktop--filter-iconified-position)
+    (minibuffer          . desktop--filter-minibuffer)
+    (name                . t)
+    (outer-window-id     . t)
+    (parent-id           . t)
+    (top                 . desktop--filter-iconified-position)
+    (tty                 . desktop--filter-tty*)
+    (tty-type            . desktop--filter-tty*)
+    (width               . desktop--filter-save-desktop-parm)
+    (window-id           . t)
+    (window-system       . t))
   "Alist of frame parameters and filtering functions.
 
 Each element is a cons (PARAM . FILTER), where PARAM is a parameter
@@ -972,27 +984,27 @@ Only meaningful when called from a filtering function in
         t)))
 
 (defun desktop--filter-restore-desktop-parm (current parameters saving)
-  ;; When switching to a GUI frame, convert desktop-XXX parameter to XXX
+  ;; When switching to a GUI frame, convert desktop--XXX parameter to XXX
   (or saving
       (not (desktop-switch-to-gui-p parameters))
       (let ((val (cdr current)))
         (if (eq val :desktop-processed)
             nil
           (cons (intern (substring (symbol-name (car current))
-                                   8)) ;; (length "desktop-")
+                                   9)) ;; (length "desktop--")
                 val)))))
 
 (defun desktop--filter-save-desktop-parm (current parameters saving)
-  ;; When switching to a tty frame, save parameter XXX as desktop-XXX so it
+  ;; When switching to a tty frame, save parameter XXX as desktop--XXX so it
   ;; can be restored in a subsequent GUI session, unless it already exists.
   (cond (saving t)
         ((desktop-switch-to-tty-p parameters)
-         (let ((sym (intern (format "desktop-%s" (car current)))))
+         (let ((sym (intern (format "desktop--%s" (car current)))))
            (if (assq sym parameters)
                nil
              (cons sym (cdr current)))))
         ((desktop-switch-to-gui-p parameters)
-         (let* ((dtp (assq (intern (format "desktop-%s" (car current)))
+         (let* ((dtp (assq (intern (format "desktop--%s" (car current)))
                            parameters))
                 (val (cdr dtp)))
            (if (eq val :desktop-processed)
@@ -1047,34 +1059,34 @@ Internal use only."
     filtered))
 
 (defun desktop--process-minibuffer-frames (frames)
-  ;; Adds a desktop-mini parameter to frames
-  ;; desktop-mini is a list (MINIBUFFER NUMBER DEFAULT?) where
+  ;; Adds a desktop--mini parameter to frames
+  ;; desktop--mini is a list (MINIBUFFER NUMBER DEFAULT?) where
   ;; MINIBUFFER  t if the frame (including minibuffer-only) owns a minibuffer
   ;; NUMBER      if MINIBUFFER = t, an ID for the frame; if nil, the ID of
   ;;             the frame containing the minibuffer used by this frame
   ;; DEFAULT?    if t, this frame is the value of default-minibuffer-frame
   (let ((count 0))
-    ;; Reset desktop-mini for all frames
+    ;; Reset desktop--mini for all frames
     (dolist (frame (frame-list))
-      (set-frame-parameter frame 'desktop-mini nil))
+      (set-frame-parameter frame 'desktop--mini nil))
     ;; Number all frames with its own minibuffer
     (dolist (frame (minibuffer-frame-list))
-      (set-frame-parameter frame 'desktop-mini
+      (set-frame-parameter frame 'desktop--mini
                            (list t
                                  (cl-incf count)
                                  (eq frame default-minibuffer-frame))))
     ;; Now link minibufferless frames with their minibuffer frames
     (dolist (frame frames)
-      (unless (frame-parameter frame 'desktop-mini)
+      (unless (frame-parameter frame 'desktop--mini)
         (let ((mb-frame (window-frame (minibuffer-window frame))))
           ;; Frames whose minibuffer frame has been filtered out will have
-          ;; desktop-mini = nil, so desktop-restore-frames will restore them
-          ;; according to their minibuffer parameter.  Set up desktop-mini
+          ;; desktop--mini = nil, so desktop-restore-frames will restore them
+          ;; according to their minibuffer parameter.  Set up desktop--mini
           ;; for the rest.
           (when (memq mb-frame frames)
-            (set-frame-parameter frame 'desktop-mini
+            (set-frame-parameter frame 'desktop--mini
                                  (list nil
-                                       (cl-second (frame-parameter mb-frame 'desktop-mini))
+                                       (cl-second (frame-parameter mb-frame 'desktop--mini))
                                        nil))))))))
 
 (defun desktop-save-frames ()
@@ -1201,6 +1213,68 @@ This function also sets `desktop-dirname' to nil."
 (defvar desktop--reuse-list nil
   "Internal use only.")
 
+(defun desktop--compute-pos (value left/top right/bottom)
+  (pcase value
+    (`(+ ,val) (+ left/top val))
+    (`(- ,val) (+ right/bottom val))
+    (val val)))
+
+(defun desktop--move-onscreen (frame)
+  "If FRAME is offscreen, move it back onscreen and, if necessary, resize it.
+When forced onscreen, frames wider than the monitor's workarea are converted
+to fullwidth, and frames taller than the workarea are converted to fullheight.
+NOTE: This only works for non-iconified frames."
+  (pcase-let* ((`(,left ,top ,width ,height) (cl-cdadr (frame-monitor-attributes frame)))
+               (right (+ left width -1))
+               (bottom (+ top height -1))
+               (fr-left (desktop--compute-pos (frame-parameter frame 'left) left right))
+               (fr-top (desktop--compute-pos (frame-parameter frame 'top) top bottom))
+               (ch-width (frame-char-width frame))
+               (ch-height (frame-char-height frame))
+               (fr-width (max (frame-pixel-width frame) (* ch-width (frame-width frame))))
+               (fr-height (max (frame-pixel-height frame) (* ch-height (frame-height frame))))
+               (fr-right (+ fr-left fr-width -1))
+               (fr-bottom (+ fr-top fr-height -1)))
+    (when (pcase desktop-restore-forces-onscreen
+            ;; Any corner is outside the screen.
+            (`all (or (< fr-bottom top)  (> fr-bottom bottom)
+                      (< fr-left   left) (> fr-left   right)
+                      (< fr-right  left) (> fr-right  right)
+                      (< fr-top    top)  (> fr-top    bottom)))
+            ;; Displaced to the left, right, above or below the screen.
+            (`t   (or (> fr-left   right)
+                      (< fr-right  left)
+                      (> fr-top    bottom)
+                      (< fr-bottom top)))
+            (_ nil))
+      (let ((fullwidth (> fr-width width))
+            (fullheight (> fr-height height))
+            (params nil))
+        ;; Position frame horizontally.
+        (cond (fullwidth
+               (push `(left . ,left) params))
+              ((> fr-right right)
+               (push `(left . ,(+ left (- width fr-width))) params))
+              ((< fr-left left)
+               (push `(left . ,left) params)))
+        ;; Position frame vertically.
+        (cond (fullheight
+               (push `(top . ,top) params))
+              ((> fr-bottom bottom)
+               (push `(top . ,(+ top (- height fr-height))) params))
+              ((< fr-top top)
+               (push `(top . ,top) params)))
+        ;; Compute fullscreen state, if required.
+        (when (or fullwidth fullheight)
+          (push (cons 'fullscreen
+                      (cond ((not fullwidth) 'fullheight)
+                            ((not fullheight) 'fullwidth)
+                            (t 'maximized)))
+                params))
+        ;; Finally, move the frame back onscreen.
+        (when params
+          (modify-frame-parameters frame params))))))
+
 (defun desktop--find-frame (predicate display &rest args)
   "Find a suitable frame in `desktop--reuse-list'.
 Look through frames whose display property matches DISPLAY and
@@ -1228,33 +1302,44 @@ is the parameter list of the frame being restored.  Internal use only."
         ;; session has already been loaded.  The other main use case, which
         ;; is the initial desktop-read upon starting Emacs, should usually
         ;; only have one, or very few, frame(s) to reuse.
-        (cond (;; When the target is tty, every existing frame is reusable.
-               (null display)
+        (cond ((null display)
+               ;; When the target is tty, every existing frame is reusable.
                (setq frame (desktop--find-frame nil display)))
-              (;; If the frame has its own minibuffer, let's see whether
+              ((car (setq mini (cdr (assq 'desktop--mini frame-cfg))))
+               ;; If the frame has its own minibuffer, let's see whether
                ;; that frame has already been loaded (which can happen after
                ;; M-x desktop-read).
-               (car (setq mini (cdr (assq 'desktop-mini frame-cfg))))
-               (setq frame (or (desktop--find-frame
-                                (lambda (f m)
-                                  (equal (frame-parameter f 'desktop-mini) m))
-                                display mini))))
-              (;; For minibufferless frames, check whether they already exist,
+               (setq frame (desktop--find-frame
+                            (lambda (f m)
+                              (equal (frame-parameter f 'desktop--mini) m))
+                            display mini))
+               ;; If it has not been loaded, and it is not a minibuffer-only frame,
+               ;; let's look for an existing non-minibuffer-only frame to reuse.
+               (unless (or frame (eq (cdr (assq 'minibuffer frame-cfg)) 'only))
+                 (setq frame (desktop--find-frame
+                              (lambda (f)
+                                (let ((w (frame-parameter f 'minibuffer)))
+                                  (and (window-live-p w)
+                                       (window-minibuffer-p w)
+                                       (eq (window-frame w) f))))
+                              display))))
+              (mini
+               ;; For minibufferless frames, check whether they already exist,
                ;; and that they are linked to the right minibuffer frame.
-               mini
                (setq frame (desktop--find-frame
                             (lambda (f n)
-                              (let ((m (frame-parameter f 'desktop-mini)))
+                              (pcase-let (((and m `(,hasmini ,num))
+                                           (frame-parameter f 'desktop--mini)))
                                 (and m
-                                     (null (cl-first m))
-                                     (= (cl-second m) n)
+                                     (null hasmini)
+                                     (= num n)
                                      (equal (cl-second (frame-parameter
                                                         (window-frame (minibuffer-window f))
-                                                        'desktop-mini))
+                                                        'desktop--mini))
                                             n))))
                             display (cl-second mini))))
-              (;; Default to just finding a frame in the same display.
-               t
+              (t
+               ;; Default to just finding a frame in the same display.
                (setq frame (desktop--find-frame nil display))))
         ;; If found, remove from the list.
         (when frame
@@ -1289,7 +1374,7 @@ its window state.  Internal use only."
             (visible (assq 'visibility filtered-cfg)))
         (setq filtered-cfg (cl-delete-if (lambda (p)
                                            (memq p '(visibility fullscreen width height)))
-                                         filtered-cfg))
+                                         filtered-cfg :key #'car))
         (when width
           (setq filtered-cfg (append `((user-size . t) (width . ,width))
                                        filtered-cfg)))
@@ -1300,10 +1385,29 @@ its window state.  Internal use only."
         (push visible alt-cfg)
         (push (cons 'fullscreen fullscreen) alt-cfg)))
 
-    ;; Time to select or create a frame an apply the big bunch of parameters
-    (if (setq frame (desktop--select-frame display filtered-cfg))
-        (modify-frame-parameters frame filtered-cfg)
-      (setq frame (make-frame-on-display display filtered-cfg)))
+    ;; Time to find or create a frame an apply the big bunch of parameters.
+    ;; If a frame needs to be created and it falls partially or wholly offscreen,
+    ;; sometimes it gets "pushed back" onscreen; however, moving it afterwards is
+    ;; allowed.  So we create the frame as invisible and then reapply the full
+    ;; parameter list (including position and size parameters).
+    (setq frame (or (desktop--select-frame display filtered-cfg)
+                    (make-frame-on-display display
+                                           (cons '(visibility)
+                                                 (cl-loop
+                                                  for param in '(left top width height minibuffer)
+                                                  collect (assq param filtered-cfg))))))
+    (modify-frame-parameters frame
+                             (if (eq (frame-parameter frame 'fullscreen) fullscreen)
+                                 ;; Workaround for bug#14949
+                                 (assq-delete-all 'fullscreen filtered-cfg)
+                               filtered-cfg))
+
+    ;; If requested, force frames to be onscreen.
+    (when (and desktop-restore-forces-onscreen
+               ;; FIXME: iconified frames should be checked too,
+               ;; but it is impossible without deiconifying them.
+               (not (eq (frame-parameter frame 'visibility) 'icon)))
+      (desktop--move-onscreen frame))
 
     ;; Let's give the finishing touches (visibility, tool-bar, maximization).
     (when lines (push lines alt-cfg))
@@ -1316,14 +1420,12 @@ its window state.  Internal use only."
   ;; Order: default minibuffer frame
   ;;        other frames with minibuffer, ascending ID
   ;;        minibufferless frames, ascending ID
-  (let ((dm1 (cdr (assq 'desktop-mini (car state1))))
-        (dm2 (cdr (assq 'desktop-mini (car state2)))))
-    (cond ((cl-third dm1) t)
-          ((cl-third dm2) nil)
-          ((eq (cl-first dm1) (cl-first dm2))
-           (< (cl-second dm1) (cl-second dm2)))
-          (t
-           (cl-first dm1)))))
+  (pcase-let ((`(,_p1 ,hasmini1 ,num1 ,default1) (assq 'desktop--mini (car state1)))
+              (`(,_p2 ,hasmini2 ,num2 ,default2) (assq 'desktop--mini (car state2))))
+    (cond (default1 t)
+          (default2 nil)
+          ((eq hasmini1 hasmini2) (< num1 num2))
+          (t hasmini1))))
 
 (defun desktop-restoring-frames-p ()
   "True if calling `desktop-restore-frames' will actually restore frames."
@@ -1349,10 +1451,10 @@ being set (usually, by reading it from the desktop)."
 
       (dolist (state desktop-saved-frame-states)
         (condition-case err
-            (let* ((frame-cfg (car state))
-                   (window-cfg (cdr state))
-                   (d-mini (cdr (assq 'desktop-mini frame-cfg)))
-                   num frame to-tty)
+            (pcase-let* ((`(,frame-cfg . ,window-cfg) state)
+                         ((and d-mini `(,hasmini ,num ,default))
+                          (cdr (assq 'desktop--mini frame-cfg)))
+                         (frame nil) (to-tty nil))
               ;; Only set target if forcing displays and the target display is different.
               (if (or (not forcing)
                       (equal target (or (assq 'display frame-cfg) '(display . nil))))
@@ -1373,17 +1475,16 @@ being set (usually, by reading it from the desktop)."
                 ;; global state; it's best to do it here than add a bunch of global
                 ;; variables to pass info back-and-forth to/from the filter function.
                 (cond
-                 ((null d-mini)) ;; No desktop-mini.  Process as normal frame.
+                 ((null d-mini)) ;; No desktop--mini.  Process as normal frame.
                  (to-tty) ;; Ignore minibuffer stuff and process as normal frame.
-                 ((cl-first d-mini) ;; Frame has minibuffer (or it is minibuffer-only).
-                  (setq num (cl-second d-mini))
+                 (hasmini ;; Frame has minibuffer (or it is minibuffer-only).
                   (when (eq (cdr (assq 'minibuffer frame-cfg)) 'only)
                     (setq frame-cfg (append '((tool-bar-lines . 0) (menu-bar-lines . 0))
                                             frame-cfg))))
                  (t ;; Frame depends on other frame's minibuffer window.
-                  (let ((mb-frame (cdr (assq (cl-second d-mini) frame-mb-map))))
+                  (let ((mb-frame (cdr (assq num frame-mb-map))))
                     (unless (frame-live-p mb-frame)
-                      (error "Minibuffer frame %s not found" (cl-second d-mini)))
+                      (error "Minibuffer frame %s not found" num))
                     (let ((mb-param (assq 'minibuffer frame-cfg))
                           (mb-window (minibuffer-window mb-frame)))
                       (unless (and (window-live-p mb-window)
@@ -1396,12 +1497,16 @@ being set (usually, by reading it from the desktop)."
                 ;; restore the window config.
                 (setq frame (desktop--make-frame frame-cfg window-cfg))
                 ;; Set default-minibuffer if required.
-                (when (cl-third d-mini) (setq default-minibuffer-frame frame))
-                ;; Store frame/NUM to assign to minibufferless frames.
-                (when num (push (cons num frame) frame-mb-map))))
+                (when default (setq default-minibuffer-frame frame))
+                ;; Store NUM/frame to assign to minibufferless frames.
+                (when hasmini (push (cons num frame) frame-mb-map))))
           (error
            (delay-warning 'desktop (error-message-string err) :error))))
 
+      ;; In case we try to delete the initial frame, we want to make sure that
+      ;; other frames are already visible (discussed in thread for bug#14841).
+      (sit-for 0 t)
+
       ;; Delete remaining frames, but do not fail if some resist being deleted.
       (unless (eq desktop-restoring-reuses-frames 'keep)
         (dolist (frame desktop--reuse-list)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index ddb632db692..0c432593909 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -331,9 +331,9 @@ See also the functions:
 ;; Mark files with some extension.
 (defun dired-mark-extension (extension &optional marker-char)
   "Mark all files with a certain EXTENSION for use in later commands.
-A `.' is *not* automatically prepended to the string entered."
-  ;; EXTENSION may also be a list of extensions instead of a single one.
-  ;; Optional MARKER-CHAR is marker to use.
+A `.' is *not* automatically prepended to the string entered.
+EXTENSION may also be a list of extensions instead of a single one.
+Optional MARKER-CHAR is marker to use."
   (interactive "sMarking extension: \nP")
   (or (listp extension)
       (setq extension (list extension)))
diff --git a/lisp/dired.el b/lisp/dired.el
index 2a7d9a297f0..c871761bb3c 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4367,7 +4367,7 @@ instead.
 
 ;;;***
 
-;;;### (autoloads nil "dired-x" "dired-x.el" "9bfe6b761cb88b4d3ab78a7905979371")
+;;;### (autoloads nil "dired-x" "dired-x.el" "1419d865898f84c17f172320e578380c")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 0728e86d072..aee48eef668 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -102,22 +102,6 @@ The value used here is passed to `quit-restore-window'."
 This is to optimize `debugger-make-xrefs'.")
 
 (defvar debugger-outer-match-data)
-(defvar debugger-outer-load-read-function)
-(defvar debugger-outer-overriding-local-map)
-(defvar debugger-outer-overriding-terminal-local-map)
-(defvar debugger-outer-track-mouse)
-(defvar debugger-outer-last-command)
-(defvar debugger-outer-this-command)
-(defvar debugger-outer-unread-command-events)
-(defvar debugger-outer-unread-post-input-method-events)
-(defvar debugger-outer-last-input-event)
-(defvar debugger-outer-last-command-event)
-(defvar debugger-outer-last-nonmenu-event)
-(defvar debugger-outer-last-event-frame)
-(defvar debugger-outer-standard-input)
-(defvar debugger-outer-standard-output)
-(defvar debugger-outer-inhibit-redisplay)
-(defvar debugger-outer-cursor-in-echo-area)
 (defvar debugger-will-be-back nil
   "Non-nil if we expect to get back in the debugger soon.")
 
@@ -174,24 +158,6 @@ first will be printed into the backtrace buffer."
           ;; Save the outer values of these vars for the `e' command
           ;; before we replace the values.
           (debugger-outer-match-data (match-data))
-          (debugger-outer-load-read-function load-read-function)
-          (debugger-outer-overriding-local-map overriding-local-map)
-          (debugger-outer-overriding-terminal-local-map
-           overriding-terminal-local-map)
-          (debugger-outer-track-mouse track-mouse)
-          (debugger-outer-last-command last-command)
-          (debugger-outer-this-command this-command)
-          (debugger-outer-unread-command-events unread-command-events)
-          (debugger-outer-unread-post-input-method-events
-           unread-post-input-method-events)
-          (debugger-outer-last-input-event last-input-event)
-          (debugger-outer-last-command-event last-command-event)
-          (debugger-outer-last-nonmenu-event last-nonmenu-event)
-          (debugger-outer-last-event-frame last-event-frame)
-          (debugger-outer-standard-input standard-input)
-          (debugger-outer-standard-output standard-output)
-          (debugger-outer-inhibit-redisplay inhibit-redisplay)
-          (debugger-outer-cursor-in-echo-area cursor-in-echo-area)
           (debugger-with-timeout-suspend (with-timeout-suspend)))
       ;; Set this instead of binding it, so that `q'
       ;; will not restore it.
@@ -294,26 +260,6 @@ first will be printed into the backtrace buffer."
                   (funcall (nth 0 debugger-previous-state))))))
           (with-timeout-unsuspend debugger-with-timeout-suspend)
           (set-match-data debugger-outer-match-data)))
-      ;; Put into effect the modified values of these variables
-      ;; in case the user set them with the `e' command.
-      (setq load-read-function debugger-outer-load-read-function)
-      (setq overriding-local-map debugger-outer-overriding-local-map)
-      (setq overriding-terminal-local-map
-            debugger-outer-overriding-terminal-local-map)
-      (setq track-mouse debugger-outer-track-mouse)
-      (setq last-command debugger-outer-last-command)
-      (setq this-command debugger-outer-this-command)
-      (setq unread-command-events debugger-outer-unread-command-events)
-      (setq unread-post-input-method-events
-            debugger-outer-unread-post-input-method-events)
-      (setq last-input-event debugger-outer-last-input-event)
-      (setq last-command-event debugger-outer-last-command-event)
-      (setq last-nonmenu-event debugger-outer-last-nonmenu-event)
-      (setq last-event-frame debugger-outer-last-event-frame)
-      (setq standard-input debugger-outer-standard-input)
-      (setq standard-output debugger-outer-standard-output)
-      (setq inhibit-redisplay debugger-outer-inhibit-redisplay)
-      (setq cursor-in-echo-area debugger-outer-cursor-in-echo-area)
       (setq debug-on-next-call debugger-step-after-exit)
       debugger-value)))
 
@@ -518,18 +464,21 @@ removes itself from that hook."
   (setq debugger-jumping-flag nil)
   (remove-hook 'post-command-hook 'debugger-reenable))
 
-(defun debugger-frame-number ()
+(defun debugger-frame-number (&optional skip-base)
   "Return number of frames in backtrace before the one point points at."
   (save-excursion
     (beginning-of-line)
+    (if (looking-at " *;;;\\|[a-z]")
+        (error "This line is not a function call"))
     (let ((opoint (point))
           (count 0))
-      (while (not (eq (cadr (backtrace-frame count)) 'debug))
-        (setq count (1+ count)))
-      ;; Skip debug--implement-debug-on-entry frame.
-      (when (eq 'debug--implement-debug-on-entry
-                (cadr (backtrace-frame (1+ count))))
-        (setq count (+ 2 count)))
+      (unless skip-base
+        (while (not (eq (cadr (backtrace-frame count)) 'debug))
+          (setq count (1+ count)))
+        ;; Skip debug--implement-debug-on-entry frame.
+        (when (eq 'debug--implement-debug-on-entry
+                  (cadr (backtrace-frame (1+ count))))
+          (setq count (+ 2 count))))
       (goto-char (point-min))
       (when (looking-at "Debugger entered--\\(Lisp error\\|returning value\\):")
         (goto-char (match-end 0))
@@ -551,12 +500,8 @@ removes itself from that hook."
   "Request entry to debugger when this frame exits.
 Applies to the frame whose line point is on in the backtrace."
   (interactive)
-  (save-excursion
-    (beginning-of-line)
-    (if (looking-at " *;;;\\|[a-z]")
-        (error "This line is not a function call")))
-  (beginning-of-line)
   (backtrace-debug (debugger-frame-number) t)
+  (beginning-of-line)
   (if (= (following-char) ? )
       (let ((inhibit-read-only t))
         (delete-char 1)
@@ -567,12 +512,8 @@ Applies to the frame whose line point is on in the backtrace."
   "Do not enter debugger when this frame exits.
 Applies to the frame whose line point is on in the backtrace."
   (interactive)
-  (save-excursion
-    (beginning-of-line)
-    (if (looking-at " *;;;\\|[a-z]")
-        (error "This line is not a function call")))
-  (beginning-of-line)
   (backtrace-debug (debugger-frame-number) nil)
+  (beginning-of-line)
   (if (= (following-char) ?*)
       (let ((inhibit-read-only t))
         (delete-char 1)
@@ -583,59 +524,33 @@ Applies to the frame whose line point is on in the backtrace."
   "Run BODY in original environment."
   (declare (indent 0))
   `(save-excursion
-    (if (null (buffer-name debugger-old-buffer))
+    (if (null (buffer-live-p debugger-old-buffer))
         ;; old buffer deleted
         (setq debugger-old-buffer (current-buffer)))
     (set-buffer debugger-old-buffer)
-    (let ((load-read-function debugger-outer-load-read-function)
-          (overriding-terminal-local-map
-           debugger-outer-overriding-terminal-local-map)
-          (overriding-local-map debugger-outer-overriding-local-map)
-          (track-mouse debugger-outer-track-mouse)
-          (last-command debugger-outer-last-command)
-          (this-command debugger-outer-this-command)
-          (unread-command-events debugger-outer-unread-command-events)
-          (unread-post-input-method-events
-           debugger-outer-unread-post-input-method-events)
-          (last-input-event debugger-outer-last-input-event)
-          (last-command-event debugger-outer-last-command-event)
-          (last-nonmenu-event debugger-outer-last-nonmenu-event)
-          (last-event-frame debugger-outer-last-event-frame)
-          (standard-input debugger-outer-standard-input)
-          (standard-output debugger-outer-standard-output)
-          (inhibit-redisplay debugger-outer-inhibit-redisplay)
-          (cursor-in-echo-area debugger-outer-cursor-in-echo-area))
-      (set-match-data debugger-outer-match-data)
-      (prog1
-          (progn ,@body)
-        (setq debugger-outer-match-data (match-data))
-        (setq debugger-outer-load-read-function load-read-function)
-        (setq debugger-outer-overriding-terminal-local-map
-              overriding-terminal-local-map)
-        (setq debugger-outer-overriding-local-map overriding-local-map)
-        (setq debugger-outer-track-mouse track-mouse)
-        (setq debugger-outer-last-command last-command)
-        (setq debugger-outer-this-command this-command)
-        (setq debugger-outer-unread-command-events unread-command-events)
-        (setq debugger-outer-unread-post-input-method-events
-              unread-post-input-method-events)
-        (setq debugger-outer-last-input-event last-input-event)
-        (setq debugger-outer-last-command-event last-command-event)
-        (setq debugger-outer-last-nonmenu-event last-nonmenu-event)
-        (setq debugger-outer-last-event-frame last-event-frame)
-        (setq debugger-outer-standard-input standard-input)
-        (setq debugger-outer-standard-output standard-output)
-        (setq debugger-outer-inhibit-redisplay inhibit-redisplay)
-        (setq debugger-outer-cursor-in-echo-area cursor-in-echo-area)
-        ))))
+    (set-match-data debugger-outer-match-data)
+    (prog1
+        (progn ,@body)
+      (setq debugger-outer-match-data (match-data)))))
 
 (defun debugger-eval-expression (exp)
-  "Eval an expression, in an environment like that outside the debugger."
+  "Eval an expression, in an environment like that outside the debugger.
+The environment used is the one when entering the activation frame at point."
   (interactive
    (list (read-from-minibuffer "Eval: "
                                nil read-expression-map t
                                'read-expression-history)))
-  (debugger-env-macro (eval-expression exp)))
+  (let ((nframe (condition-case nil (1+ (debugger-frame-number 'skip-base))
+                  (error 0))) ;; If on first line.
+        (base (if (eq 'debug--implement-debug-on-entry
+                      (cadr (backtrace-frame 1 'debug)))
+                  'debug--implement-debug-on-entry 'debug)))
+    (debugger-env-macro
+      (let ((val (backtrace-eval exp nframe base)))
+        (prog1
+            (prin1 val t)
+          (let ((str (eval-expression-print-format val)))
+            (if str (princ str t))))))))
 
 (defvar debugger-mode-map
   (let ((map (make-keymap))
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 36c72f3a3bd..ae20e5270e1 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2088,8 +2088,6 @@ expressions; a `progn' form will be returned enclosing these forms."
 (defvar edebug-coverage) ; the coverage results of each expression of function.
 
 (defvar edebug-buffer) ; which buffer the function is in.
-(defvar edebug-outside-executing-macro)
-(defvar edebug-outside-defining-kbd-macro)
 
 (defvar edebug-execution-mode 'step) ; Current edebug mode set by user.
 (defvar edebug-next-execution-mode nil) ; Use once instead of initial mode.
@@ -2097,12 +2095,6 @@ expressions; a `progn' form will be returned enclosing these forms."
 (defvar edebug-outside-debug-on-error) ; the value of debug-on-error outside
 (defvar edebug-outside-debug-on-quit) ; the value of debug-on-quit outside
 
-
-(defvar edebug-outside-pre-command-hook)
-(defvar edebug-outside-post-command-hook)
-
-(defvar cl-lexical-debug)  ;; Defined in cl.el
-
 ;;; Handling signals
 
 (defun edebug-signal (signal-name signal-data)
@@ -2154,10 +2146,7 @@ error is signaled again."
               ;; Binding these may not be the right thing to do.
               ;; We want to allow the global values to be changed.
               (debug-on-error (or debug-on-error edebug-on-error))
-              (debug-on-quit edebug-on-quit)
-
-              ;; Lexical bindings must be uncompiled for this to work.
-              (cl-lexical-debug t))
+              (debug-on-quit edebug-on-quit))
           (unwind-protect
               (let ((signal-hook-function 'edebug-signal))
                 (setq edebug-execution-mode (or edebug-next-execution-mode
@@ -2386,9 +2375,6 @@ MSG is printed after `::::} '."
 (defvar edebug-window-data)  ; window and window-start for current function
 (defvar edebug-outside-windows) ; outside window configuration
 (defvar edebug-eval-buffer) ; for the evaluation list.
-(defvar edebug-outside-o-a-p) ; outside overlay-arrow-position
-(defvar edebug-outside-o-a-s) ; outside overlay-arrow-string
-(defvar edebug-outside-c-i-e-a) ; outside cursor-in-echo-area
 (defvar edebug-outside-d-c-i-n-s-w) ; outside default-cursor-in-non-selected-windows
 
 (defvar edebug-eval-list nil) ;; List of expressions to evaluate.
@@ -2398,8 +2384,6 @@ MSG is printed after `::::} '."
 ;; Emacs 19 adds an arg to mark and mark-marker.
 (defalias 'edebug-mark-marker 'mark-marker)
 
-(defvar edebug-outside-unread-command-events)
-
 (defun edebug--display (value offset-index arg-mode)
   (unless (marker-position edebug-def-mark)
     ;; The buffer holding the source has been killed.
@@ -2421,7 +2405,6 @@ MSG is printed after `::::} '."
         (edebug-outside-buffer (current-buffer))
         (edebug-outside-point (point))
         (edebug-outside-mark (edebug-mark))
-        (edebug-outside-unread-command-events unread-command-events)
         edebug-outside-windows          ; Window or screen configuration.
         edebug-buffer-points
 
@@ -2431,9 +2414,6 @@ MSG is printed after `::::} '."
         edebug-trace-window
         edebug-trace-window-start
 
-        (edebug-outside-o-a-p overlay-arrow-position)
-        (edebug-outside-o-a-s overlay-arrow-string)
-        (edebug-outside-c-i-e-a cursor-in-echo-area)
         (edebug-outside-d-c-i-n-s-w
          (default-value 'cursor-in-non-selected-windows)))
     (unwind-protect
@@ -2445,8 +2425,7 @@ MSG is printed after `::::} '."
               )
           (setq-default cursor-in-non-selected-windows t)
           (if (not (buffer-name edebug-buffer))
-              (let ((debug-on-error nil))
-                (error "Buffer defining %s not found" edebug-function)))
+              (user-error "Buffer defining %s not found" edebug-function))
 
           (if (eq 'after arg-mode)
               ;; Compute result string now before windows are modified.
@@ -2486,10 +2465,9 @@ MSG is printed after `::::} '."
               ;; Check whether positions are up-to-date.
               ;; This assumes point is never before symbol.
               (if (not (memq (following-char) '(?\( ?\# ?\` )))
-                  (let ((debug-on-error nil))
-                    (error "Source has changed - reevaluate definition of %s"
-                           edebug-function)
-                    )))
+                  (user-error "Source has changed - reevaluate definition of %s"
+                              edebug-function)
+                ))
 
           (setcdr edebug-window-data
                   (edebug-adjust-window (cdr edebug-window-data)))
@@ -2645,11 +2623,6 @@ MSG is printed after `::::} '."
       (if edebug-eval-buffer (kill-buffer edebug-eval-buffer))
       (with-timeout-unsuspend edebug-with-timeout-suspend)
       ;; Reset global variables to outside values in case they were changed.
-      (setq
-       unread-command-events edebug-outside-unread-command-events
-       overlay-arrow-position edebug-outside-o-a-p
-       overlay-arrow-string edebug-outside-o-a-s
-       cursor-in-echo-area edebug-outside-c-i-e-a)
       (setq-default cursor-in-non-selected-windows edebug-outside-d-c-i-n-s-w)
       )))
 
@@ -2667,27 +2640,6 @@ MSG is printed after `::::} '."
 (defvar edebug-inside-windows)
 (defvar edebug-interactive-p)
 
-(defvar edebug-outside-map)
-(defvar edebug-outside-standard-output)
-(defvar edebug-outside-standard-input)
-(defvar edebug-outside-current-prefix-arg)
-(defvar edebug-outside-last-command)
-(defvar edebug-outside-this-command)
-
-;; Note: here we have defvars for variables that are
-;; built-in in certain versions.
-;; Each defvar makes a difference
-;; in versions where the variable is *not* built-in.
-
-;; Emacs 18  FIXME
-
-;; Emacs 19.
-(defvar edebug-outside-last-command-event)
-(defvar edebug-outside-last-input-event)
-(defvar edebug-outside-last-event-frame)
-(defvar edebug-outside-last-nonmenu-event)
-(defvar edebug-outside-track-mouse)
-
 (defun edebug--recursive-edit (arg-mode)
   ;; Start up a recursive edit inside of edebug.
   ;; The current buffer is the edebug-buffer, which is put into edebug-mode.
@@ -2705,28 +2657,6 @@ MSG is printed after `::::} '."
         ;; The window configuration may be saved and restored
         ;; during a recursive-edit
         edebug-inside-windows
-
-        ;; Save the outside value of executing macro.  (here??)
-        (edebug-outside-executing-macro executing-kbd-macro)
-        (edebug-outside-pre-command-hook
-         (edebug-var-status 'pre-command-hook))
-        (edebug-outside-post-command-hook
-         (edebug-var-status 'post-command-hook))
-
-        (edebug-outside-standard-output standard-output)
-        (edebug-outside-standard-input standard-input)
-        (edebug-outside-defining-kbd-macro defining-kbd-macro)
-
-        (edebug-outside-last-command last-command)
-        (edebug-outside-this-command this-command)
-
-        (edebug-outside-current-prefix-arg current-prefix-arg)
-
-        (edebug-outside-last-input-event last-input-event)
-        (edebug-outside-last-command-event last-command-event)
-        (edebug-outside-last-event-frame last-event-frame)
-        (edebug-outside-last-nonmenu-event last-nonmenu-event)
-        (edebug-outside-track-mouse track-mouse)
         )
 
     (unwind-protect
@@ -2757,7 +2687,7 @@ MSG is printed after `::::} '."
               (overriding-local-map nil)
               (overriding-terminal-local-map nil)
 
-                  ;; Bind again to outside values.
+              ;; Bind again to outside values.
               (debug-on-error edebug-outside-debug-on-error)
               (debug-on-quit edebug-outside-debug-on-quit)
 
@@ -2805,27 +2735,7 @@ MSG is printed after `::::} '."
               ;; gotta have a buffer to let its buffer local variables be set
               (get-buffer-create " bogus edebug buffer"))
             ));; inner let
-
-      ;; Reset global vars to outside values, in case they have been changed.
-      (setq
-       last-command-event edebug-outside-last-command-event
-       last-command edebug-outside-last-command
-       this-command edebug-outside-this-command
-       current-prefix-arg edebug-outside-current-prefix-arg
-       last-input-event edebug-outside-last-input-event
-       last-event-frame edebug-outside-last-event-frame
-       last-nonmenu-event edebug-outside-last-nonmenu-event
-       track-mouse edebug-outside-track-mouse
-
-       standard-output edebug-outside-standard-output
-       standard-input edebug-outside-standard-input
-       defining-kbd-macro edebug-outside-defining-kbd-macro)
-
-      (setq executing-kbd-macro edebug-outside-executing-macro)
-      (edebug-restore-status
-       'post-command-hook edebug-outside-post-command-hook)
-      (edebug-restore-status
-       'pre-command-hook edebug-outside-pre-command-hook))))
+      )))
 
 
 ;;; Display related functions
@@ -3423,6 +3333,9 @@ edebug-mode."
 (defmacro edebug-outside-excursion (&rest body)
   "Evaluate an expression list in the outside context.
 Return the result of the last expression."
+  ;; Only restores the non-variables context since all the variables let-bound
+  ;; by Edebug will be properly reset to the appropriate context's value by
+  ;; backtrace-eval.
   (declare (debug t))
   `(save-excursion                      ; of current-buffer
      (if edebug-save-windows
@@ -3435,89 +3348,32 @@ Return the result of the last expression."
            (edebug-set-windows edebug-outside-windows)))
 
      (set-buffer edebug-buffer)         ; why?
-     ;; (use-local-map edebug-outside-map)
      (set-match-data edebug-outside-match-data)
      ;; Restore outside context.
-     (let (;; (edebug-inside-map (current-local-map)) ;; restore map??
-           (last-command-event edebug-outside-last-command-event)
-           (last-command edebug-outside-last-command)
-           (this-command edebug-outside-this-command)
-           (unread-command-events edebug-outside-unread-command-events)
-           (current-prefix-arg edebug-outside-current-prefix-arg)
-           (last-input-event edebug-outside-last-input-event)
-           (last-event-frame edebug-outside-last-event-frame)
-           (last-nonmenu-event edebug-outside-last-nonmenu-event)
-           (track-mouse edebug-outside-track-mouse)
-           (standard-output edebug-outside-standard-output)
-           (standard-input edebug-outside-standard-input)
-
-           (executing-kbd-macro edebug-outside-executing-macro)
-           (defining-kbd-macro edebug-outside-defining-kbd-macro)
-           ;; Get the values out of the saved statuses.
-           (pre-command-hook (cdr edebug-outside-pre-command-hook))
-           (post-command-hook (cdr edebug-outside-post-command-hook))
-
-           ;; See edebug-display.
-           (overlay-arrow-position edebug-outside-o-a-p)
-           (overlay-arrow-string edebug-outside-o-a-s)
-           (cursor-in-echo-area edebug-outside-c-i-e-a)
-           )
-       (setq-default cursor-in-non-selected-windows edebug-outside-d-c-i-n-s-w)
-       (unwind-protect
-           (with-current-buffer edebug-outside-buffer ; of edebug-buffer
-             (goto-char edebug-outside-point)
-             (if (marker-buffer (edebug-mark-marker))
-                 (set-marker (edebug-mark-marker) edebug-outside-mark))
-             ,@body)
-
-         ;; Back to edebug-buffer.  Restore rest of inside context.
-         ;; (use-local-map edebug-inside-map)
-         (if edebug-save-windows
-             ;; Restore inside windows.
-             (edebug-set-windows edebug-inside-windows))
-
-         ;; Save values that may have been changed.
-         (setq
-          edebug-outside-last-command-event last-command-event
-          edebug-outside-last-command last-command
-          edebug-outside-this-command this-command
-          edebug-outside-unread-command-events unread-command-events
-          edebug-outside-current-prefix-arg current-prefix-arg
-          edebug-outside-last-input-event last-input-event
-          edebug-outside-last-event-frame last-event-frame
-          edebug-outside-last-nonmenu-event last-nonmenu-event
-          edebug-outside-track-mouse track-mouse
-          edebug-outside-standard-output standard-output
-          edebug-outside-standard-input standard-input
-
-          edebug-outside-executing-macro executing-kbd-macro
-          edebug-outside-defining-kbd-macro defining-kbd-macro
-
-          edebug-outside-o-a-p overlay-arrow-position
-          edebug-outside-o-a-s overlay-arrow-string
-          edebug-outside-c-i-e-a cursor-in-echo-area
-          edebug-outside-d-c-i-n-s-w (default-value
-                                       'cursor-in-non-selected-windows)
-          )
-
-         ;; Restore the outside saved values; don't alter
-         ;; the outside binding loci.
-         (setcdr edebug-outside-pre-command-hook pre-command-hook)
-         (setcdr edebug-outside-post-command-hook post-command-hook)
-
-         (setq-default cursor-in-non-selected-windows t)
-         ))                             ; let
-     ))
-
-(defvar cl-debug-env)  ; defined in cl; non-nil when lexical env used.
+     (setq-default cursor-in-non-selected-windows edebug-outside-d-c-i-n-s-w)
+     (unwind-protect
+         (with-current-buffer edebug-outside-buffer ; of edebug-buffer
+           (goto-char edebug-outside-point)
+           (if (marker-buffer (edebug-mark-marker))
+               (set-marker (edebug-mark-marker) edebug-outside-mark))
+           ,@body)
+
+       ;; Back to edebug-buffer.  Restore rest of inside context.
+       ;; (use-local-map edebug-inside-map)
+       (if edebug-save-windows
+           ;; Restore inside windows.
+           (edebug-set-windows edebug-inside-windows))
+
+       ;; Save values that may have been changed.
+       (setq edebug-outside-d-c-i-n-s-w
+             (default-value 'cursor-in-non-selected-windows))
+
+       ;; Restore the outside saved values; don't alter
+       ;; the outside binding loci.
+       (setq-default cursor-in-non-selected-windows t))))
 
 (defun edebug-eval (expr)
-  ;; Are there cl lexical variables active?
-  (eval (if (and (bound-and-true-p cl-debug-env)
-                 (fboundp 'cl-macroexpand-all))
-            (cl-macroexpand-all expr cl-debug-env)
-          expr)
-        lexical-binding))
+  (backtrace-eval expr 0 'edebug-after))
 
 (defun edebug-safe-eval (expr)
   ;; Evaluate EXPR safely.
@@ -4268,7 +4124,7 @@ With prefix argument, make it a temporary breakpoint."
              (eq (nth 1 (nth 1 frame1)) '())
              (eq (nth 1 frame2) 'edebug-enter))
     ;; `edebug-enter' calls itself on its first invocation.
-    (if (eq (nth 1 (internal--called-interactively-p--get-frame i))
+    (if (eq (nth 1 (backtrace-frame i 'called-interactively-p))
             'edebug-enter)
         2 1)))
 
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 8b149aad7bb..edcfc409085 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -425,7 +425,7 @@ of the piece of advice."
          (get-next-frame
           (lambda ()
             (setq frame1 frame2)
-            (setq frame2 (internal--called-interactively-p--get-frame i))
+            (setq frame2 (backtrace-frame i #'called-interactively-p))
             ;; (message "Advice Frame %d = %S" i frame2)
             (setq i (1+ i)))))
     (when (and (eq (nth 1 frame2) 'apply)
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 6ba29d3748f..896fc2a954e 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -109,94 +109,127 @@ If no one is selected, default secret key is used.  "
              (if verbose
                  (epa--read-signature-type)
                'clear)))))
-  (epa-sign-region start end signers mode))
+  (let ((inhibit-read-only t))
+    (epa-sign-region start end signers mode)))
+
+(defun epa-mail-default-recipients ()
+  "Return the default list of encryption recipients for a mail buffer."
+  (let ((config (epg-configuration))
+        recipients-string real-recipients)
+    (save-excursion
+      (goto-char (point-min))
+      (save-restriction
+        (narrow-to-region (point)
+                          (if (search-forward mail-header-separator nil 0)
+                              (match-beginning 0)
+                            (point)))
+        (setq recipients-string
+              (mapconcat #'identity
+                         (nconc (mail-fetch-field "to" nil nil t)
+                                (mail-fetch-field "cc" nil nil t)
+                                (mail-fetch-field "bcc" nil nil t))
+                         ","))
+        (setq recipients-string
+              (mail-strip-quoted-names
+               (with-temp-buffer
+                 (insert "to: " recipients-string "\n")
+                 (expand-mail-aliases (point-min) (point-max))
+                 (car (mail-fetch-field "to" nil nil t))))))
+
+      (setq real-recipients
+            (split-string recipients-string "," t "[ \t\n]*"))
+
+      ;; Process all the recipients thru the list of GnuPG groups.
+      ;; Expand GnuPG group names to what they stand for.
+      (setq real-recipients
+            (apply #'nconc
+                   (mapcar
+                    (lambda (recipient)
+                      (or (epg-expand-group config recipient)
+                          (list recipient)))
+                    real-recipients)))
+
+      ;; Process all the recipients thru the user's list
+      ;; of encryption aliases.
+      (setq real-recipients
+            (apply #'nconc
+                   (mapcar
+                    (lambda (recipient)
+                      (let ((tem (assoc recipient epa-mail-aliases)))
+                        (if tem (cdr tem)
+                          (list recipient))))
+                    real-recipients)))
+      )))
 
 ;;;###autoload
-(defun epa-mail-encrypt (start end recipients sign signers)
-  "Encrypt the current buffer.
-The buffer is expected to contain a mail message.
+(defun epa-mail-encrypt (&optional recipients signers)
+  "Encrypt the outgoing mail message in the current buffer.
+Takes the recipients from the text in the header in the buffer
+and translates them through `epa-mail-aliases'.
+With prefix argument, asks you to select among them interactively
+and also whether and how to sign.
 
-Don't use this command in Lisp programs!"
+Called from Lisp, the optional argument RECIPIENTS is a list
+of recipient addresses, t to perform symmetric encryption,
+or nil meaning use the defaults.
+
+SIGNERS is a list of keys to sign the message with."
   (interactive
-   (save-excursion
-     (let ((verbose current-prefix-arg)
-           (config (epg-configuration))
-           (context (epg-make-context epa-protocol))
-           recipients-string recipients recipient-key sign)
-       (goto-char (point-min))
-       (save-restriction
-         (narrow-to-region (point)
-                           (if (search-forward mail-header-separator nil 0)
-                               (match-beginning 0)
-                             (point)))
-         (setq recipients-string
-               (mapconcat #'identity
-                          (nconc (mail-fetch-field "to" nil nil t)
-                                 (mail-fetch-field "cc" nil nil t)
-                                 (mail-fetch-field "bcc" nil nil t))
-                          ","))
-         (setq recipients
-               (mail-strip-quoted-names
-                (with-temp-buffer
-                  (insert "to: " recipients-string "\n")
-                  (expand-mail-aliases (point-min) (point-max))
-                  (car (mail-fetch-field "to" nil nil t))))))
-       (if recipients
-           (setq recipients (delete ""
-                                    (split-string recipients
-                                                  "[ \t\n]*,[ \t\n]*"))))
-
-       ;; Process all the recipients thru the list of GnuPG groups.
-       ;; Expand GnuPG group names to what they stand for.
-       (setq recipients
-             (apply #'nconc
-                    (mapcar
-                     (lambda (recipient)
-                       (or (epg-expand-group config recipient)
-                           (list recipient)))
-                     recipients)))
-
-       (goto-char (point-min))
-       (if (search-forward mail-header-separator nil t)
-           (forward-line))
-       (setq epa-last-coding-system-specified
-             (or coding-system-for-write
-                 (epa--select-safe-coding-system (point) (point-max))))
-       (list (point) (point-max)
-             (if verbose
-                 (epa-select-keys
-                  context
-                  "Select recipients for encryption.
+   (let ((verbose current-prefix-arg)
+         (context (epg-make-context epa-protocol)))
+     (list (if verbose
+               (or (epa-select-keys
+                    context
+                    "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
-                  recipients)
-               (if recipients
+                    (epa-mail-default-recipients))
+                   t))
+           (and verbose (y-or-n-p "Sign? ")
+                (epa-select-keys context
+                                 "Select keys for signing.  ")))))
+  (let (start recipient-keys default-recipients)
+    (save-excursion
+      (setq recipient-keys
+            (cond ((eq recipients t)
+                   nil)
+                  (recipients recipients)
+                  (t
+                   (setq default-recipients
+                         (epa-mail-default-recipients))
+                   ;; Convert recipients to keys.
                    (apply
                     'nconc
                     (mapcar
                      (lambda (recipient)
-                       (setq recipient-key
-                             (epa-mail--find-usable-key
-                              (epg-list-keys
-                               (epg-make-context epa-protocol)
-                               (if (string-match "@" recipient)
-                                   (concat "<" recipient ">")
-                                 recipient))
-                              'encrypt))
-                       (unless (or recipient-key
-                                   (y-or-n-p
-                                    (format
-                                     "No public key for %s; skip it? "
-                                     recipient)))
-                         (error "No public key for %s" recipient))
-                       (if recipient-key (list recipient-key)))
-                     recipients))))
-             (setq sign (if verbose (y-or-n-p "Sign? ")))
-             (if sign
-                 (epa-select-keys context
-                                  "Select keys for signing.  "))))))
-  ;; Don't let some read-only text stop us from encrypting.
-  (let ((inhibit-read-only t))
-    (epa-encrypt-region start end recipients sign signers)))
+                       (let ((recipient-key
+                              (epa-mail--find-usable-key
+                               (epg-list-keys
+                                (epg-make-context epa-protocol)
+                                (if (string-match "@" recipient)
+                                    (concat "<" recipient ">")
+                                  recipient))
+                               'encrypt)))
+                         (unless (or recipient-key
+                                     (y-or-n-p
+                                      (format
+                                       "No public key for %s; skip it? "
+                                       recipient)))
+                           (error "No public key for %s" recipient))
+                         (if recipient-key (list recipient-key))))
+                       default-recipients)))))
+
+      (goto-char (point-min))
+      (if (search-forward mail-header-separator nil t)
+          (forward-line))
+      (setq start (point))
+
+      (setq epa-last-coding-system-specified
+            (or coding-system-for-write
+                (epa--select-safe-coding-system (point) (point-max)))))
+
+    ;; Don't let some read-only text stop us from encrypting.
+    (let ((inhibit-read-only t))
+      (epa-encrypt-region start (point-max) recipient-keys signers signers))))
 
 ;;;###autoload
 (defun epa-mail-import-keys ()
diff --git a/lisp/epa.el b/lisp/epa.el
index 68e7a18fe17..a99fb9230e1 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -48,6 +48,18 @@
   :version "23.1"
   :group 'epa)
 
+(defcustom epa-mail-aliases nil
+  "Alist of aliases of email addresses that stand for encryption keys.
+Each element is (ALIAS EXPANSIONS...).
+It means that when a message is addressed to ALIAS,
+instead of encrypting it for ALIAS, encrypt it for EXPANSIONS...
+If EXPANSIONS is empty, ignore ALIAS as regards encryption.
+That is a handy way to avoid warnings about addresses
+that you don't have any key for."
+  :type '(repeat (cons (string :tag "Alias") (repeat '(string :tag "Expansion"))))
+  :group 'epa
+  :version "24.4")
+
 (defface epa-validity-high
   '((default :weight bold)
     (((class color) (background dark)) :foreground "PaleTurquoise"))
diff --git a/lisp/frame.el b/lisp/frame.el
index 71e7cc10de2..22cf484e54a 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -317,6 +317,9 @@ there (in decreasing order of priority)."
                    t))
           ;; Create the new frame.
           (let (parms new)
+            ;; MS-Windows needs this to avoid inflooping below.
+            (if (eq system-type 'windows-nt)
+                (sit-for 0 t))
             ;; If the frame isn't visible yet, wait till it is.
             ;; If the user has to position the window,
             ;; Emacs doesn't know its real position until
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5d3de61aa91..c32853a2a9f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2013-07-26  Tassilo Horn  <tsdh@gnu.org>
+
+        * gnus-sum.el (gnus-sort-threads-recursively): New defcustom.
+        (gnus-sort-threads): Use it.
+
+2013-07-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * gnus-art.el (gnus-button-url-regexp): Make it match url in which
+        punctuation characters follow parentheses (bug#14950).
+
 2013-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.el (gnus-continuum-version):
@@ -1892,7 +1902,7 @@
 
         * nnmail.el (mail-send-and-exit): Silence the byte compiler.
 
-2012-06-26  Peter Munster  <pmrb@free.fr>
+2012-06-26  Peter Münster  <pmrb@free.fr>
 
         * gnus-demon.el (gnus-demon-timers): Now a plist (function -> timer).
         (gnus-demon-cancel): Ditto.
@@ -2119,7 +2129,7 @@
         (spam-check-BBDB): Use it.
         (spam-enter-ham-BBDB): Use it.
 
-2012-06-26  Peter Munster  <pmrb@free.fr>  (tiny change)
+2012-06-26  Peter Münster  <pmrb@free.fr>  (tiny change)
 
         * gnus-group.el (gnus-group-get-new-news):
         New parameter `one-level' for scanning exactly one level.
@@ -8482,7 +8492,7 @@
         * nnimap.el (nnimap-request-group): Low higher than high to signal no
         messages in empty groups.
 
-2010-10-01  Ted Zlatanov  <tzz@lifelogs.com>
+2010-10-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * nnimap.el (nnimap-request-group): Don't bug out when there's an empty
         non-UIDNEXT group.
@@ -8623,7 +8633,7 @@
         * nndraft.el (nndraft-request-expire-articles): Use the group name
         instead if "nndraft".  Fix found by Nils Ackermann.
 
-2010-09-29  Ludovic Courtes  <ludo@gnu.org>
+2010-09-29  Ludovic Courtès  <ludo@gnu.org>
 
         * nnregistry.el: Add.
 
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 9043a23361e..9a71bc35b41 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -340,7 +340,7 @@
 
         * nnmail.el (nnmail-spool-file): Allow lists of files.
 
-1998-08-20  Per Starback  <starback@update.uu.se>
+1998-08-20  Per Starbäck  <starback@update.uu.se>
 
         * gnus/gnus-start.el (gnus-check-first-time-used): Change current
         buffer before creating help group.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 4ddd622ce9a..df223bd332b 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -210,7 +210,7 @@
         * mml1991.el (mml1991-pgg-encrypt): Decode according to CTE before
         encrypting.
 
-2003-12-28  Ivan Boldyrev  <boldyrev@uiggm.nsc.ru>  (tiny change).
+2003-12-28  Ivan Boldyrev  <boldyrev@uiggm.nsc.ru>  (tiny change)
 
         * mml1991.el (mml1991-pgg-sign): Use unibyte when re-encoding.
 
@@ -4490,7 +4490,7 @@
 
         * gnus-start.el (gnus-backup-startup-file): Fixed custom type.
 
-2003-02-24  Ted Zlatanov  <tzz@lifelogs.com>
+2003-02-24  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * spam.el: Disabled spam-get-article-as-filename.
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 31a108a3c98..e65b9fb99e4 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7177,15 +7177,17 @@ groups."
           "\\(?:"
           ;; Match paired parentheses, e.g. in Wikipedia URLs:
           ;; http://thread.gmane.org/47B4E3B2.3050402@gmail.com
-          "[" chars punct "]+" "(" "[" chars punct "]+" "[" chars "]*)" "[" chars "]*"
+          "[" chars punct "]+" "(" "[" chars punct "]+" "[" chars "]*)"
+          "\\(?:" "[" chars punct "]+" "[" chars "]" "\\)?"
           "\\|"
-          "[" chars punct     "]+" "[" chars "]"
+          "[" chars punct "]+" "[" chars "]"
           "\\)"))
      (concat ;; XEmacs 21.4 doesn't support POSIX.
       "\\([-a-z0-9_=!?#$@~%&*+\\/:;.,]\\|\\w\\)+"
       "\\([-a-z0-9_=#$@~%&*+\\/]\\|\\w\\)"))
    "\\)")
   "Regular expression that matches URLs."
+  :version "24.4"
   :group 'gnus-article-buttons
   :type 'regexp)
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index f3918b0a215..15cbb5a45e6 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -847,6 +847,13 @@ controls how articles are sorted."
                           (function :tag "other"))
                   (boolean :tag "Reverse order"))))
 
+(defcustom gnus-sort-threads-recursively t
+  "If non-nil, `gnus-thread-sort-functions' are applied recursively.
+Setting this to nil allows sorting high-score, recent,
+etc. threads to the top of the summary buffer while still
+retaining chronological old to new sorting order inside threads."
+  :group 'gnus-summary-sort
+  :type 'boolean)
 
 (defcustom gnus-thread-sort-functions '(gnus-thread-sort-by-number)
   "*List of functions used for sorting threads in the summary buffer.
@@ -4876,9 +4883,11 @@ If LINE, insert the rebuilt thread starting on line LINE."
     (gnus-message 8 "Sorting threads...")
     (prog1
         (condition-case nil
-            (let ((max-lisp-eval-depth (max max-lisp-eval-depth 5000)))
-              (gnus-sort-threads-recursive
-               threads (gnus-make-sort-function gnus-thread-sort-functions)))
+            (let ((max-lisp-eval-depth (max max-lisp-eval-depth 5000))
+                  (sort-func (gnus-make-sort-function gnus-thread-sort-functions)))
+              (if gnus-sort-threads-recursively
+                  (gnus-sort-threads-recursive threads sort-func)
+                (sort threads sort-func)))
           ;; Even after binding max-lisp-eval-depth, the recursive
           ;; sorter might fail for very long threads.  In that case,
           ;; try using a (less well-tested) non-recursive sorter.
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index e57911947b1..f90d88ee0de 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -1403,11 +1403,11 @@
         (mh-x-image-url-display): Don't display image if the URL looks
         malformed.
 
-2003-10-04  Mark D Baushke  <mdb@gnu.org>
+2003-10-04  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-comp.el (mh-letter-menu): Simplify menu heading.
 
-2003-10-03  Mark D Baushke  <mdb@gnu.org>
+2003-10-03  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-mime.el (mh-mml-query-cryptographic-method): Avoid
         revisionist history and still provide a good default.
@@ -3877,7 +3877,7 @@
         runs checkdoc and lm-verify which is useful before releasing the
         software. It can and should be expanded to do real unit tests.
 
-2003-04-22  Mark D Baushke  <mdb@gnu.org>
+2003-04-22  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-alias.el: Update Copyright.
         * mh-comp.el: Ditto.
@@ -6106,7 +6106,7 @@
         explicitly stated.
         (mh-visit-folder): Really fix it this time.
 
-2003-01-01  Mark D Baushke  <mdb@gnu.org>
+2003-01-01  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-alias.el (mh-alias-from-has-no-alias-p): Needs the
         mh-autoload comment or mh-customize may have problems finding the
@@ -6854,7 +6854,7 @@
         * Makefile: Moved .PHONY rule after all rule for compatibility
         with BSD/OS's old pmake.
 
-2002-12-03  Mark D Baushke  <mdb@gnu.org>
+2002-12-03  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-e.el (mh-get-new-mail): Simplify no-new-mail test.
         (mh-add-cur-notation): Remove unnecessary function.
@@ -6878,7 +6878,7 @@
         number of scan lines is fewer than mh-large-folders (closes SF
         #646794).
 
-2002-12-02  Mark D Baushke  <mdb@gnu.org>
+2002-12-02  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-e.el (mh-add-cur-notation): New function to mark the
         current message with the mh-note-cur character.
@@ -8312,7 +8312,7 @@
         variable as new-file-flag.
         This addresses part of SF #627015.
 
-2002-10-24  Mark D Baushke  <mdb@gnu.org>
+2002-10-24  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-comp.el (mh-forward): Fix mh-mml-compose-insert-p reference
         in last commit to be mh-mml-compose-insert-flag.
@@ -8581,7 +8581,7 @@
 
         * mh-comp.el (mh-mml-to-mime autoload): Ditto.
 
-2002-10-21  Mark D Baushke  <mdb@gnu.org>
+2002-10-21  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-mime.el (smiley-region): Use load for a non-fatal dependency
         on the smiley library.
@@ -8735,7 +8735,7 @@
         prompted for the number of messages to display, you got an error.
         This has been fixed.
 
-2002-10-19  Mark D Baushke  <mdb@gnu.org>
+2002-10-19  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-e.el (mh-last-destination-folder): Destination of last refile
         command.
@@ -8777,7 +8777,7 @@
         macro mh-compat-write-file-hook to use write-file-functions for
         Emacs 21.4 and local-write-file-hooks for older versions.
 
-2002-10-18  Mark D Baushke  <mdb@gnu.org>
+2002-10-18  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-utils.el (mh-invisible-headers): Add more anti-spam headers.
 
@@ -9079,7 +9079,7 @@
         (mh-remove-xemacs-horizontal-scrollbar): New macro to avoid
         compiler-warnings.
 
-2002-10-10  Mark D Baushke  <mdb@gnu.org>
+2002-10-10  Mark D. Baushke  <mdb@gnu.org>
 
         * Makefile (EMACS_OPTIONS): New macro for command-line compile
         options.
@@ -9088,13 +9088,13 @@
         (COMPILE_COMMAND): Combine the compile command with its options.
         (.el.elc): Use the new $(COMPILE_COMMAND).
 
-2002-10-10  Mark D Baushke  <mdb@gnu.org>
+2002-10-10  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-speed.el (mh-speed-select-attached-frame): Define a new
         compatibility macro for getting to the attached-frame.
         (mh-speed-update-current-folder): Use it.
 
-2002-10-10  Mark D Baushke  <mdb@gnu.org>
+2002-10-10  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-speed.el (mh-speed-update-current-folder): Use
         'dframe-select-attached-frame if we are in a newer speedbar
@@ -9452,7 +9452,7 @@
         present in the load-path.
         * mh-mime.el (mh-require): Don't use it anymore.
 
-2002-07-15  Mark D Baushke  <mdb@gnu.org>
+2002-07-15  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-utils.el (mh-update-scan-format): Rewrite for compatibility
         with XEmacs as replace-match appears not to have identical
@@ -9531,7 +9531,7 @@
 
         * mh-mime.el (mm-destroy-parts): Add definition for old emacs.
 
-2002-06-30  Mark D Baushke  <mdb@gnu.org>
+2002-06-30  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-utils.el (mh-update-scan-format): Add documentation string.
         (mh-scan-msg-format-regexp): Update the regexp to find %(msg).
@@ -9574,7 +9574,7 @@
         * mh-index.el (mh-count-windows): This function works around the
         lack of the window-list builtin function in emacs20.
 
-2002-06-29  Mark D Baushke  <mdb@gnu.org>
+2002-06-29  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-utils.el (mh-message-number-width): New function to scan
         the last message of a folder and return its width.
@@ -9625,7 +9625,7 @@
         * mh-mime.el (gnus-newsgroup-name): Initialize it to nil, so that
         mm-uu-dissect doesn't cause error.
 
-2002-06-27  Mark D Baushke  <mdb@gnu.org>
+2002-06-27  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-utils.el (mh-cmd-note): Make buffer-local. Changes to this
         variable should be made via the new mh-set-default-cmd-note
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index c92eacd4473..441849fd2af 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2248,7 +2248,10 @@ The method used must be an out-of-band method."
               spec (format-spec-make
                     ?t (tramp-get-connection-property
                         (tramp-get-connection-process v) "temp-file" ""))
-              options (format-spec tramp-ssh-controlmaster-options spec)
+              options (format-spec
+                       (if tramp-use-ssh-controlmaster-options
+                           tramp-ssh-controlmaster-options "")
+                       spec)
               spec (format-spec-make
                     ?h host ?u user ?p port ?c options
                     ?k (if keep-date " " ""))
@@ -4416,7 +4419,8 @@ connection if a previous connection has died for some reason."
               (let* ((target-alist (tramp-compute-multi-hops vec))
                      ;; We will apply `tramp-ssh-controlmaster-options'
                      ;; only for the first hop.
-                     (options tramp-ssh-controlmaster-options)
+                     (options (if tramp-use-ssh-controlmaster-options
+                                  tramp-ssh-controlmaster-options ""))
                      (process-connection-type tramp-process-connection-type)
                      (process-adaptive-read-buffering nil)
                      (coding-system-for-read nil)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index db6a1e381a6..48e13004c36 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -305,6 +305,14 @@ useful only in combination with `tramp-default-proxies-alist'.")
     "Call ssh to detect whether it supports the Control* arguments.
 Return a string to be used in `tramp-methods'.")
 
+;;;###tramp-autoload
+(defcustom tramp-use-ssh-controlmaster-options
+  (not (zerop (length tramp-ssh-controlmaster-options)))
+  "Whether to use `tramp-ssh-controlmaster-options'."
+  :group 'tramp
+  :version "24.4"
+  :type 'boolean)
+
 (defcustom tramp-default-method
   ;; An external copy method seems to be preferred, because it performs
   ;; much better for large files, and it hasn't too serious delays
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 16097c1c0b2..019fa8a358d 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -3983,7 +3983,7 @@
         (org-export-latex-tables-tend): New options.
         (org-export-latex-tables): Use the new options.
 
-2012-09-30  tumashu  <tumashu@gmail.com>  (tiny change)
+2012-09-30  Feng Shu  <tumashu@gmail.com>  (tiny change)
 
         * org-exp.el (org-export-language-setup): Add simplified chinese
         translation.
@@ -9437,7 +9437,7 @@
         (org-update-checkbox-count-maybe): Add an optional argument passed to
         org-update-checkbox-count.
 
-2011-07-28  Ted Zlatanov  <tzz@lifelogs.com>
+2011-07-28  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * org.el (org-fontify-meta-lines-and-blocks): Ignore errors.
 
@@ -18000,7 +18000,7 @@
         * org-habit.el (org-habit-build-graph): Help-echo date when
         mouse is over stars.
 
-2010-07-19  Jan Böker  <jan.boecker@jboecker.de>
+2010-07-19  Jan Böcker  <jan.boecker@jboecker.de>
 
         * org.el (org-file-apps): Improve docstring to reflect
         grouping matches.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index a3bd000a4f3..c2ff5011a0e 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1135,9 +1135,13 @@ comment at the start of cc-engine.el for more info."
                    (not (memq sym '(boundary ignore nil))))
           ;; Need to investigate closer whether we've crossed
           ;; between a substatement and its containing statement.
-          (if (setq saved (if (looking-at c-block-stmt-1-key)
-                              ptok
-                            pptok))
+          (if (setq saved
+                    (cond ((and (looking-at c-block-stmt-1-2-key)
+                                (eq (char-after ptok) ?\())
+                           pptok)
+                          ((looking-at c-block-stmt-1-key)
+                           ptok)
+                          (t pptok)))
               (cond ((> start saved) (setq pos saved))
                     ((= start saved) (setq ret 'up)))))
 
@@ -7988,7 +7992,8 @@ comment at the start of cc-engine.el for more info."
          (or (looking-at c-block-stmt-1-key)
              (and (eq (char-after) ?\()
                   (zerop (c-backward-token-2 1 t lim))
-                  (looking-at c-block-stmt-2-key)))
+                  (or (looking-at c-block-stmt-2-key)
+                      (looking-at c-block-stmt-1-2-key))))
          (point))))
 
 (defun c-after-special-operator-id (&optional lim)
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 6a4bfd9e875..4e8ce6bac28 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1307,7 +1307,8 @@ casts and declarations are fontified.  Used on level 2 and higher."
                             (goto-char match-pos)
                             (backward-char)
                             (c-backward-token-2)
-                            (looking-at c-block-stmt-2-key)))
+                            (or (looking-at c-block-stmt-2-key)
+                                (looking-at c-block-stmt-1-2-key))))
                      (setq context nil
                            c-restricted-<>-arglists t))
                     ;; Near BOB.
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index af52ad53aad..2c0a1317b04 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2187,6 +2187,18 @@ identifiers that follows the type in a normal declaration."
   t (c-make-keywords-re t (c-lang-const c-block-stmt-1-kwds)))
 (c-lang-defvar c-block-stmt-1-key (c-lang-const c-block-stmt-1-key))
 
+(c-lang-defconst c-block-stmt-1-2-kwds
+  "Statement keywords optionally followed by a paren sexp.
+Keywords here should also be in `c-block-stmt-1-kwds'."
+  t nil
+  java '("try"))
+
+(c-lang-defconst c-block-stmt-1-2-key
+  ;; Regexp matching the start of a statement which may be followed by a
+  ;; paren sexp and will then be followed by a substatement.
+  t (c-make-keywords-re t (c-lang-const c-block-stmt-1-2-kwds)))
+(c-lang-defvar c-block-stmt-1-2-key (c-lang-const c-block-stmt-1-2-key))
+
 (c-lang-defconst c-block-stmt-2-kwds
   "Statement keywords followed by a paren sexp and then by a substatement."
   t    '("for" "if" "switch" "while")
@@ -2938,7 +2950,8 @@ identifier or one of the keywords on `c-<>-type-kwds' or
 `c-<>-arglist-kwds'.  If there's an identifier before then the whole
 expression is considered to be a type."
   t (or (consp (c-lang-const c-<>-type-kwds))
-        (consp (c-lang-const c-<>-arglist-kwds))))
+        (consp (c-lang-const c-<>-arglist-kwds)))
+  java t)
 (c-lang-defvar c-recognize-<>-arglists (c-lang-const c-recognize-<>-arglists))
 
 (c-lang-defconst c-enums-contain-decls
diff --git a/lisp/simple.el b/lisp/simple.el
index 4b158d31f36..1fb2fa6014c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3141,14 +3141,17 @@ Also, delete any process that is exited or signaled."
   (display-buffer (button-get button 'process-buffer)))
 
 (defun list-processes (&optional query-only buffer)
-  "Display a list of all processes.
+  "Display a list of all processes that are Emacs sub-processes.
 If optional argument QUERY-ONLY is non-nil, only processes with
 the query-on-exit flag set are listed.
 Any process listed as exited or signaled is actually eliminated
 after the listing is made.
 Optional argument BUFFER specifies a buffer to use, instead of
 \"*Process List*\".
-The return value is always nil."
+The return value is always nil.
+
+This function lists only processes that were launched by Emacs.  To
+see other processes running on the system, use `list-system-processes'."
   (interactive)
   (or (fboundp 'process-list)
       (error "Asynchronous subprocesses are not supported on this system"))
@@ -5530,8 +5533,7 @@ Mode' for details."
   (visual-line-mode 1))
 
 (define-globalized-minor-mode global-visual-line-mode
-  visual-line-mode turn-on-visual-line-mode
-  :lighter " vl")
+  visual-line-mode turn-on-visual-line-mode)
 
 
 (defun transpose-chars (arg)
diff --git a/lisp/subr.el b/lisp/subr.el
index 7130639dbe5..3b85a9bedb0 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4191,22 +4191,6 @@ I is the index of the frame after FRAME2.  It should return nil
 if those frames don't seem special and otherwise, it should return
 the number of frames to skip (minus 1).")
 
-(defmacro internal--called-interactively-p--get-frame (n)
-  ;; `sym' will hold a global variable, which will be used kind of like C's
-  ;; "static" variables.
-  (let ((sym (make-symbol "base-index")))
-    `(progn
-       (defvar ,sym)
-       (unless (boundp ',sym)
-         (let ((i 1))
-           (while (not (eq (indirect-function (nth 1 (backtrace-frame i)) t)
-                           (indirect-function 'called-interactively-p)))
-             (setq i (1+ i)))
-           (setq ,sym i)))
-       ;; (unless (eq (nth 1 (backtrace-frame ,sym)) 'called-interactively-p)
-       ;;   (error "called-interactively-p: %s is out-of-sync!" ,sym))
-       (backtrace-frame (+ ,sym ,n)))))
-
 (defun called-interactively-p (&optional kind)
   "Return t if the containing function was called by `call-interactively'.
 If KIND is `interactive', then only return t if the call was made
@@ -4241,7 +4225,7 @@ command is called from a keyboard macro?"
            (get-next-frame
             (lambda ()
               (setq frame nextframe)
-              (setq nextframe (internal--called-interactively-p--get-frame i))
+              (setq nextframe (backtrace-frame i 'called-interactively-p))
               ;; (message "Frame %d = %S" i nextframe)
               (setq i (1+ i)))))
       (funcall get-next-frame) ;; Get the first frame.
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 4920e85c351..6f03cba1f75 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -237,9 +237,11 @@ See `run-hooks'."
     ;; VC commands
     (define-key map "v" 'vc-next-action)   ;; C-x v v
     (define-key map "=" 'vc-diff)          ;; C-x v =
+    (define-key map "D" 'vc-root-diff)     ;; C-x v D
     (define-key map "i" 'vc-register)      ;; C-x v i
     (define-key map "+" 'vc-update)        ;; C-x v +
     (define-key map "l" 'vc-print-log)     ;; C-x v l
+    (define-key map "L" 'vc-print-root-log) ;; C-x v L
     ;; More confusing than helpful, probably
     ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark.
     ;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer
diff --git a/lisp/window.el b/lisp/window.el
index a2acd2a81b0..86d93c0a9f6 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5470,6 +5470,9 @@ argument, ACTION is t."
   (let ((buffer (if (bufferp buffer-or-name)
                     buffer-or-name
                   (get-buffer buffer-or-name)))
+        ;; Make sure that when we split windows the old window keeps
+        ;; point, bug#14829.
+        (split-window-keep-point t)
         ;; Handle the old form of the first argument.
         (inhibit-same-window (and action (not (listp action)))))
     (unless (listp action) (setq action nil))