From 9fbb8462a6cb91e3bf8e70f6b330853bbef85491 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 12 May 2014 21:51:58 +0300 Subject: [PATCH 1/5] Fix bug #17479 with spliced paragraphs in User manual. doc/emacs/mule.texi (Language Environments): Fix @anchor placement. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/mule.texi | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a1e6dd8903f..eb8a82d185d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2014-05-12 Eli Zaretskii + + * mule.texi (Language Environments): Fix @anchor placement. + (Bug#17479) + 2014-05-02 Eli Zaretskii * trouble.texi (Lossage, DEL Does Not Delete, Stuck Recursive) diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 839bd95ae5e..26d144ef194 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -431,6 +431,7 @@ file. @kindex C-h L @findex describe-language-environment +@anchor{Describe Language Environment} To display information about the effects of a certain language environment @var{lang-env}, use the command @kbd{C-h L @var{lang-env} @key{RET}} (@code{describe-language-environment}). This tells you @@ -439,7 +440,6 @@ character sets, coding systems, and input methods that go with it. It 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. -@anchor{Describe Language Environment} @vindex set-language-environment-hook You can customize any language environment with the normal hook From 636ae7c2624af8a5c46c8e6fac17fcb42e0495f1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 12 May 2014 22:10:59 +0300 Subject: [PATCH 2/5] A better fix for bug #17479. doc/emacs/mule.texi (Language Environments): Remove unused @anchor. --- doc/emacs/ChangeLog | 2 +- doc/emacs/mule.texi | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index eb8a82d185d..7858c78847f 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,6 +1,6 @@ 2014-05-12 Eli Zaretskii - * mule.texi (Language Environments): Fix @anchor placement. + * mule.texi (Language Environments): Remove unused @anchor. (Bug#17479) 2014-05-02 Eli Zaretskii diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 26d144ef194..27c10c9f60a 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -431,7 +431,6 @@ file. @kindex C-h L @findex describe-language-environment -@anchor{Describe Language Environment} To display information about the effects of a certain language environment @var{lang-env}, use the command @kbd{C-h L @var{lang-env} @key{RET}} (@code{describe-language-environment}). This tells you From e95b937a425af518f97837c5d9b41a8b2e8c0e58 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 13 May 2014 10:54:08 +0200 Subject: [PATCH 3/5] * net/browse-url.el (browse-url): Use `unhandled-file-name-directory' when setting `default-directory', in order to circumvent stalled remote connections. Fixes: debbugs:17425 --- lisp/ChangeLog | 8 +++++++- lisp/net/browse-url.el | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3cfb50cafd0..803ef1f60b2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-05-13 Michael Albinus + + * 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-12 Stefan Monnier * emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled @@ -97,7 +103,7 @@ Remove HISTFILE and HISTSIZE; it's too late to set them here. Add :version entry. (tramp-open-shell): Do not let-bind `tramp-end-of-output'. - Add "HISTSIZE=/dev/null" to the shell's env arguments. Do not send + Add "HISTFILE=/dev/null" to the shell's env arguments. Do not send extra "PSx=..." commands. (tramp-maybe-open-connection): Setenv HISTFILE to /dev/null. (Bug#17295) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 33f4eda9604..9644a509b22 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -807,15 +807,15 @@ first, if that exists." (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. From a5d09243e7259152291f8a14b9528d7c177b6639 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 13 May 2014 23:59:12 -0700 Subject: [PATCH 4/5] Make some pointless/useless emerge.el options obsolete * vc/emerge.el (emerge-temp-file-prefix): Make pointless option obsolete. (emerge-temp-file-mode): Make non-functional option obsolete. --- lisp/ChangeLog | 6 ++++++ lisp/vc/emerge.el | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 803ef1f60b2..da8f90d3b3b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-05-14 Glenn Morris + + * vc/emerge.el (emerge-temp-file-prefix): + Make pointless option obsolete. + (emerge-temp-file-mode): Make non-functional option obsolete. + 2014-05-13 Michael Albinus * net/browse-url.el (browse-url): diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index 0cf4484aac1..d4638616dd7 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el @@ -261,11 +261,19 @@ Do not start with `~/' or `~USERNAME/'." :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 @@ keymap. Leaves merge in fast mode." (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)) From 34cba8e885f2ed1c0e9c805ad89b9464e0b5766a Mon Sep 17 00:00:00 2001 From: Stephen Berman Date: Wed, 14 May 2014 12:21:13 -0400 Subject: [PATCH 5/5] * lisp/minibuffer.el (completion-pcm--merge-try): Merge trailing / with suffix. Fixes: debbugs:15419 --- lisp/ChangeLog | 6 ++++++ lisp/minibuffer.el | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index da8f90d3b3b..c4df237a668 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-05-14 Stephen Berman + Stefan Monnier + + * minibuffer.el (completion-pcm--merge-try): Merge trailing / with + suffix (bug#15419). + 2014-05-14 Glenn Morris * vc/emerge.el (emerge-temp-file-prefix): diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 929ab3dc325..242dc7fe94e 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -3215,11 +3215,20 @@ the same set of elements." ;; 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)