[Emacs-diffs] trunk r117104: Merge from emacs-24; up to r117113

[Glenn Morris]

------------------------------------------------------------
revno: 117104 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-05-14 10:01:29 -0700
message:
  Merge from emacs-24; up to r117113
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/mule.texi            mule.texi-20091113204419-o5vbwnq5f7feedwu-6270
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/minibuffer.el             
minibuffer.el-20091113204419-o5vbwnq5f7feedwu-8622
  lisp/net/browse-url.el         
browseurl.el-20091113204419-o5vbwnq5f7feedwu-1785
  lisp/vc/emerge.el              emerge.el-20091113204419-o5vbwnq5f7feedwu-464

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-05-04 19:37:56 +0000
+++ b/doc/emacs/ChangeLog       2014-05-14 17:01:29 +0000
@@ -1,3 +1,7 @@
+2014-05-14  Eli Zaretskii  <address@hidden>
+
+       * mule.texi (Language Environments): Remove unused @anchor.  (Bug#17479)
+
 2014-05-04  Eli Zaretskii  <address@hidden>
 
        * trouble.texi (Lossage, DEL Does Not Delete, Stuck Recursive)

=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi       2014-04-29 14:45:24 +0000
+++ b/doc/emacs/mule.texi       2014-05-12 19:10:59 +0000
@@ -439,7 +439,6 @@
 also shows some sample text to illustrate scripts used in this
 language environment.  If you give an empty input for @var{lang-env},
 this command describes the chosen language environment.
address@hidden Language Environment}
 
 @vindex set-language-environment-hook
   You can customize any language environment with the normal hook

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-14 06:35:36 +0000
+++ b/lisp/ChangeLog    2014-05-14 17:01:29 +0000
@@ -1,3 +1,21 @@
+2014-05-14  Stephen Berman <address@hidden>
+            Stefan Monnier  <address@hidden>
+
+       * minibuffer.el (completion-pcm--merge-try): Merge trailing / with
+       suffix (bug#15419).
+
+2014-05-14  Glenn Morris  <address@hidden>
+
+       * vc/emerge.el (emerge-temp-file-prefix):
+       Make pointless option obsolete.
+       (emerge-temp-file-mode): Make non-functional option obsolete.
+
+2014-05-14  Michael Albinus  <address@hidden>
+
+       * net/browse-url.el (browse-url):
+       Use `unhandled-file-name-directory' when setting `default-directory',
+       in order to circumvent stalled remote connections.  (Bug#17425)
+
 2014-05-14  Glenn Morris  <address@hidden>
 
        * printing.el (subst-char-in-string, make-temp-file, pr-get-symbol):

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2014-05-08 03:41:21 +0000
+++ b/lisp/minibuffer.el        2014-05-14 17:01:29 +0000
@@ -3216,11 +3216,20 @@
                          ;; Not `prefix'.
                          mergedpat))
            ;; New pos from the start.
-           (newpos (length (completion-pcm--pattern->string pointpat)))
+          (newpos (length (completion-pcm--pattern->string pointpat)))
            ;; Do it afterwards because it changes `pointpat' by side effect.
            (merged (completion-pcm--pattern->string (nreverse mergedpat))))
 
-      (setq suffix (completion--merge-suffix merged newpos suffix))
+      (setq suffix (completion--merge-suffix
+                    ;; The second arg should ideally be "the position right
+                    ;; after the last char of `merged' that comes from the text
+                    ;; to be completed".  But completion-pcm--merge-completions
+                    ;; currently doesn't give us that info.  So instead we just
+                    ;; use the "last but one" position, which tends to work
+                    ;; well in practice since `suffix' always starts
+                    ;; with a boundary and we hence mostly/only care about
+                    ;; merging this boundary (bug#15419).
+                    merged (max 0 (1- (length merged))) suffix))
       (cons (concat prefix merged suffix) (+ newpos (length prefix)))))))
 
 (defun completion-pcm-try-completion (string table pred point)

=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el    2014-05-10 20:48:36 +0000
+++ b/lisp/net/browse-url.el    2014-05-13 08:54:08 +0000
@@ -807,15 +807,15 @@
   (interactive (browse-url-interactive-arg "URL: "))
   (unless (called-interactively-p 'interactive)
     (setq args (or args (list browse-url-new-window-flag))))
+  (when (and url-handler-mode (not (file-name-absolute-p url)))
+    (setq url (expand-file-name url)))
   (let ((process-environment (copy-sequence process-environment))
        (function (or (and (string-match "\\`mailto:"; url)
                           browse-url-mailto-function)
                      browse-url-browser-function))
        ;; Ensure that `default-directory' exists and is readable (b#6077).
-       (default-directory (if (and (file-directory-p default-directory)
-                                   (file-readable-p default-directory))
-                              default-directory
-                            (expand-file-name "~/"))))
+       (default-directory (or (unhandled-file-name-directory default-directory)
+                              (expand-file-name "~/"))))
     ;; When connected to various displays, be careful to use the display of
     ;; the currently selected frame, rather than the original start display,
     ;; which may not even exist any more.

=== modified file 'lisp/vc/emerge.el'
--- a/lisp/vc/emerge.el 2014-02-03 00:40:49 +0000
+++ b/lisp/vc/emerge.el 2014-05-14 06:59:12 +0000
@@ -261,11 +261,19 @@
   :type 'string
   :group 'emerge)
 
+(make-obsolete-variable 'emerge-temp-file-prefix
+                       "customize `temporary-file-directory' instead."
+                       "24.4" 'set)
+
 (defcustom emerge-temp-file-mode 384   ; u=rw only
   "Mode for Emerge temporary files."
   :type 'integer
   :group 'emerge)
 
+(make-obsolete-variable 'emerge-temp-file-mode
+                       "it has no effect, temporary files are always private."
+                       "24.4" 'set)
+
 (defcustom emerge-combine-versions-template
   "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"
   "Template for `emerge-combine-versions' to combine the two versions.
@@ -2881,6 +2889,7 @@
   (let (f (old-modes (default-file-modes)))
     (unwind-protect
        (progn
+         ;; This has no effect, since make-temp-file sets umask = 700.
          (set-default-file-modes emerge-temp-file-mode)
          (setq f (make-temp-file (concat emerge-temp-file-prefix prefix))))
       (set-default-file-modes old-modes))