commit 16eec6fc55dcc05d1d819f18998e84a9580b2521 (HEAD, refs/remotes/origin/master) Author: Michael Albinus Date: Sun Apr 5 09:30:03 2015 +0200 Remove entry from last sync with emacs-24, it wasn't applicable diff --git a/test/ChangeLog b/test/ChangeLog index 4999576..f7bec2e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,8 +1,3 @@ -2015-04-04 Michael Albinus - - * automated/tramp-tests.el (tramp-test06-directory-file-name): - Fix docstring and last test. - 2015-04-01 Artur Malabarba * automated/package-test.el: Avoid async while testing. commit b79bcfd34f726c864943edd0964eea72d4f0aec5 Author: Pete Williamson Date: Sat Apr 4 20:18:45 2015 -0700 Fix .emacs and .emacs.d/init file recursion problem for NaCl * files.el (file-truename): Add NaCl to the exception list ms-dos uses. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 694b346..7fa39b4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-05 Pete Williamson (tiny-change) + + Fix .emacs and .emacs.d/init file recursion problem for NaCl + * files.el (file-truename): Add NaCl to the exception list ms-dos uses. + 2015-04-04 Alan Mackenzie * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change diff --git a/lisp/files.el b/lisp/files.el index 42b00ac..0fdf004 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1192,7 +1192,7 @@ containing it, until no links are left at any level. (setq dirfile (directory-file-name dir)) ;; If these are equal, we have the (or a) root directory. (or (string= dir dirfile) - (and (memq system-type '(windows-nt ms-dos cygwin)) + (and (memq system-type '(windows-nt ms-dos cygwin nacl)) (eq (compare-strings dir 0 nil dirfile 0 nil t) t)) ;; If this is the same dir we last got the truename for, ;; save time--don't recalculate. commit 207f11935755236b21ca4d3fe6b19206e0a9ed33 Merge: 389698e 21d4bf6 Author: Paul Eggert Date: Sat Apr 4 15:02:09 2015 -0700 Merge from origin/emacs-24 21d4bf6 * admin/make-tarball.txt: Copyedits. f3b70a7 ; ChangeLog fix 07432a8 Revert "CC Mode: Stop Font Lock forcing fontification from BOL." Conflicts: lisp/ChangeLog commit 389698e53a4d3130035e46bf7f8b28480ae9ed8a Merge: c1b8b17 0ad5fe0 Author: Paul Eggert Date: Sat Apr 4 14:59:06 2015 -0700 Merge from origin/emacs-24 The following commit was skipped: 0ad5fe0 * etc/AUTHORS: Update the AUTHORS file commit c1b8b17a7ac22123fe8d2d647265f19d2cc92625 Merge: 4839549 dd3f567 Author: Paul Eggert Date: Sat Apr 4 14:58:35 2015 -0700 Merge from origin/emacs-24 dd3f567 Fix tramp-tests.el Conflicts: test/ChangeLog commit 48395495d6f6602f666c11d0b38f6600b629ccfc Merge: b32bb3f 1b70aa6 Author: Paul Eggert Date: Sat Apr 4 14:58:01 2015 -0700 Merge from origin/emacs-24 The following commit was skipped: 1b70aa6 Fix bug#20233, do not merge with master commit b32bb3f2f6ae6b76d9cc74dbace2745ee119eddb Author: Artur Malabarba Date: Sat Apr 4 20:44:59 2015 +0100 (package--with-work-buffer-async): Protect macro arguments. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9b2b312..11abda5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,7 @@ * emacs-lisp/package.el (package--download-and-read-archives): Add `package-archives' to `package--downloads-in-progress' instead of overwriting it. + (package--with-work-buffer-async): Protect macro arguments. 2015-04-04 Michael Albinus diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 3f77840..32a3e01 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1090,23 +1090,27 @@ function, call it with no arguments (instead of executing BODY), otherwise propagate the error. For description of the other arguments see `package--with-work-buffer'." (declare (indent 3) (debug t)) - `(if (or (not ,async) - (not (string-match-p "\\`https?:" ,location))) - (package--with-work-buffer ,location ,file ,@body) - (url-retrieve (concat ,location ,file) - (lambda (status) - (if (eq (car status) :error) - (if (functionp ,async) - (funcall ,async) - (signal (cdar status) (cddr status))) - (goto-char (point-min)) - (unless (search-forward "\n\n" nil 'noerror) - (error "Invalid url response")) - (delete-region (point-min) (point)) - ,@body) - (kill-buffer (current-buffer))) - nil - 'silent))) + (macroexp-let2* macroexp-copyable-p + ((async-1 async) + (file-1 file) + (location-1 location)) + `(if (or (not ,async-1) + (not (string-match-p "\\`https?:" ,location-1))) + (package--with-work-buffer ,location-1 ,file-1 ,@body) + (url-retrieve (concat ,location-1 ,file-1) + (lambda (status) + (if (eq (car status) :error) + (if (functionp ,async-1) + (funcall ,async-1) + (signal (cdar status) (cddr status))) + (goto-char (point-min)) + (unless (search-forward "\n\n" nil 'noerror) + (error "Invalid url response")) + (delete-region (point-min) (point)) + ,@body) + (kill-buffer (current-buffer))) + nil + 'silent)))) (defun package--check-signature-content (content string &optional sig-file) "Check signature CONTENT against STRING. commit f674de6f08e3789fed88f24ffc45bfffc8d60520 Author: Artur Malabarba Date: Sat Apr 4 20:20:21 2015 +0100 emacs-lisp/package.el: Don't overwrite downloads-in-progress. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a7d953..9b2b312 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-04-04 Artur Malabarba + + * emacs-lisp/package.el (package--download-and-read-archives): Add + `package-archives' to `package--downloads-in-progress' instead of + overwriting it. + 2015-04-04 Michael Albinus * net/tramp-cache.el (tramp-flush-directory-property): Quote directory diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 583598e..3f77840 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1410,7 +1410,9 @@ This populates `package-archive-contents'. If ASYNC is non-nil, perform the downloads asynchronously." ;; The downloaded archive contents will be read as part of ;; `package--update-downloads-in-progress'. - (setq package--downloads-in-progress package-archives) + (setq package--downloads-in-progress + (append package-archives + package--downloads-in-progress)) (dolist (archive package-archives) (condition-case-unless-debug nil (package--download-one-archive archive "archive-contents" async) commit 5824dd5b6a67b3de83d281049d3694066e1462a7 Author: Michael Albinus Date: Sat Apr 4 20:34:47 2015 +0200 Quote directory name in tramp-flush-directory-property * net/tramp-cache.el (tramp-flush-directory-property): Quote directory name when used in regexp. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cab6aba..5a7d953 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-04 Michael Albinus + + * net/tramp-cache.el (tramp-flush-directory-property): Quote directory + name when used in regexp. + 2015-04-04 Alan Mackenzie Fix debbugs#20240 part two (jit-lock error during `comment-dwim'). diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 155053c..ba29ef0 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -196,7 +196,8 @@ Remove also properties of all files in subdirectories." (maphash (lambda (key _value) (when (and (stringp (tramp-file-name-localname key)) - (string-match directory (tramp-file-name-localname key))) + (string-match (regexp-quote directory) + (tramp-file-name-localname key))) (remhash key tramp-cache-data))) tramp-cache-data))) commit 0115aceb584b007a6faba3de701a972659025fd7 Author: Jan D Date: Sat Apr 4 16:10:06 2015 +0200 Close a timing hole in selections. Fixes: debbugs:16737 * src/xselect.c (x_reply_selection_request) (receive_incremental_selection): Call set_property_change_object inside block_input. (wait_for_property_change): Move set property_change_reply(_object) outside of this function. (set_property_change_object): New function. diff --git a/src/ChangeLog b/src/ChangeLog index 09225f2..1c3f933 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2015-04-04 Jan Djärv + + * xselect.c (x_reply_selection_request) + (receive_incremental_selection): Call set_property_change_object + inside block_input. + (wait_for_property_change): Move set property_change_reply(_object) + outside of this function (Bug#16737). + (set_property_change_object): New function. + 2015-04-03 Jan Djärv * xterm.c (handle_one_xevent): Always redraw tool tips on diff --git a/src/xselect.c b/src/xselect.c index 027192d..1570c4f 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -531,6 +531,16 @@ static struct prop_location *property_change_reply_object; static struct prop_location *property_change_wait_list; +static void +set_property_change_object (struct prop_location *location) +{ + /* Input must be blocked so we don't get the event before we set these. */ + if (! input_blocked_p ()) + emacs_abort (); + XSETCAR (property_change_reply, Qnil); + property_change_reply_object = location; +} + /* Send the reply to a selection request event EVENT. */ @@ -633,6 +643,11 @@ x_reply_selection_request (struct input_event *event, { int format_bytes = cs->format / 8; bool had_errors_p = x_had_errors_p (display); + + /* Must set this inside block_input (). unblock_input may read + events and setting property_change_reply in + wait_for_property_change is then too late. */ + set_property_change_object (cs->wait_object); unblock_input (); bytes_remaining = cs->size; @@ -673,6 +688,8 @@ x_reply_selection_request (struct input_event *event, : format_bytes); XFlush (display); had_errors_p = x_had_errors_p (display); + // See comment above about property_change_reply. + set_property_change_object (cs->wait_object); unblock_input (); if (had_errors_p) break; @@ -1059,14 +1076,11 @@ wait_for_property_change (struct prop_location *location) { ptrdiff_t count = SPECPDL_INDEX (); - if (property_change_reply_object) - emacs_abort (); - /* Make sure to do unexpect_property_change if we quit or err. */ record_unwind_protect_ptr (wait_for_property_change_unwind, location); - XSETCAR (property_change_reply, Qnil); - property_change_reply_object = location; + /* See comment in x_reply_selection_request about setting + property_change_reply. Do not do it here. */ /* If the event we are waiting for arrives beyond here, it will set property_change_reply, because property_change_reply_object says so. */ @@ -1381,6 +1395,8 @@ receive_incremental_selection (struct x_display_info *dpyinfo, wait_object = expect_property_change (display, window, property, PropertyNewValue); XFlush (display); + // See comment in x_reply_selection_request about property_change_reply. + set_property_change_object (wait_object); unblock_input (); while (true) @@ -1419,6 +1435,8 @@ receive_incremental_selection (struct x_display_info *dpyinfo, XDeleteProperty (display, window, property); wait_object = expect_property_change (display, window, property, PropertyNewValue); + // See comment in x_reply_selection_request about property_change_reply. + set_property_change_object (wait_object); XFlush (display); unblock_input (); commit 4fabcbfbcd8447351ae59b01b329a0dabebea872 Author: Alan Mackenzie Date: Sat Apr 4 10:26:31 2015 +0000 Fix debbugs#20240 part two (jit-lock error during `comment-dwim'). jit-lock.el (jit-lock-after-change): Widen the buffer before putting 'fontified text properties. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5757317..cab6aba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-04-04 Alan Mackenzie + + Fix debbugs#20240 part two (jit-lock error during `comment-dwim'). + + * jit-lock.el (jit-lock-after-change): Widen the buffer before + putting 'fontified text properties. + 2015-04-03 Michael Albinus * net/tramp-cache.el (tramp-flush-file-property) diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 0faabeb..d5651c6 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -650,12 +650,14 @@ will take place when text is fontified stealthily." (let ((jit-lock-start start) (jit-lock-end end)) (with-buffer-prepared-for-jit-lock - (run-hook-with-args 'jit-lock-after-change-extend-region-functions - start end old-len) - ;; Make sure we change at least one char (in case of deletions). - (setq jit-lock-end (min (max jit-lock-end (1+ start)) (point-max))) - ;; Request refontification. - (put-text-property jit-lock-start jit-lock-end 'fontified nil)) + (save-restriction + (widen) + (run-hook-with-args 'jit-lock-after-change-extend-region-functions + start end old-len) + ;; Make sure we change at least one char (in case of deletions). + (setq jit-lock-end (min (max jit-lock-end (1+ start)) (point-max))) + ;; Request refontification. + (put-text-property jit-lock-start jit-lock-end 'fontified nil))) ;; Mark the change for deferred contextual refontification. (when jit-lock-context-unfontify-pos (setq jit-lock-context-unfontify-pos commit 21d4bf6c449c9ca24f514c82cc0aa2f2ba65f748 (refs/remotes/origin/emacs-24) Author: Glenn Morris Date: Fri Apr 3 11:16:23 2015 -0400 * admin/make-tarball.txt: Copyedits. diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 9603c61..9511f4b 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -52,9 +52,11 @@ General steps (for each step, check for possible errors): number to that of the actual release. Pick a date about a week from now when you intend to make the release. Use M-x add-release-logs to add the ChangeLog entries for that date to the tar file (but - not yet to the repository). Name the tar file as - emacs-XX.Y-rc1.tar. If all goes well in the following week, you - can simply rename the file and use it for the actual release. + do not commit the entries to the repository until the actual release). + Name the tar file as emacs-XX.Y-rc1.tar. If all goes well in the + following week, you can simply rename the file and use it for the + actual release. If you need another release candidate, remember + to adjust the ChangeLog entries. 4. autoreconf -i -I m4 --force make bootstrap commit f3b70a795bd521fe08e18a5307c67831ab77c96d Author: Glenn Morris Date: Fri Apr 3 11:11:15 2015 -0400 ; ChangeLog fix diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cb96110..da54070 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,7 @@ 2015-04-03 Alan Mackenzie - * Revert CC Mode change from 2015-01-31 "Handle "#" operater - properly inside macro". + * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change + "Stop Font Lock forcing fontification from BOL." (Bug#20245) 2015-04-01 Michael Albinus @@ -203,10 +203,8 @@ 2015-02-01 Alan Mackenzie CC Mode: Stop Font Lock forcing fontification from BOL. - Fixes debbugs#19669. - * progmodes/cc-mode.el (c-font-lock-init): - Setq font-lock-extend-region-functions to nil. + Setq font-lock-extend-region-functions to nil. (Bug#19669) 2015-01-31 Alan Mackenzie commit 07432a8c2d916382127e8a2021e9088f10dca8e2 Author: Alan Mackenzie Date: Fri Apr 3 12:22:45 2015 +0000 Revert "CC Mode: Stop Font Lock forcing fontification from BOL. Bug#19669." This reverts commit d69e9f1c24f37f36af33b0468c5a4e100dbb09b6. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b3d7c5..cb96110 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-03 Alan Mackenzie + + * Revert CC Mode change from 2015-01-31 "Handle "#" operater + properly inside macro". + 2015-04-01 Michael Albinus * net/tramp.el (tramp-handle-unhandled-file-name-directory): diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 50a7004..1cba502 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1237,14 +1237,6 @@ This function is called from `c-common-init', once per mode initialization." (font-lock-mark-block-function . c-mark-function))) - ;; Prevent `font-lock-default-fontify-region' extending the region it will - ;; fontify to whole lines by removing `font-lock-extend-region-whole-lines' - ;; (and, coincidentally, `font-lock-extend-region-multiline' (which we do - ;; not need)) from `font-lock-extend-region-functions'. (Emacs only). This - ;; fixes Emacs bug #19669. - (when (boundp 'font-lock-extend-region-functions) - (setq font-lock-extend-region-functions nil)) - (make-local-variable 'font-lock-fontify-region-function) (setq font-lock-fontify-region-function 'c-font-lock-fontify-region) commit 0ad5fe01aea8073e2b9f24c322bd1e9c4b83ca9b (tag: refs/tags/emacs-24.5-rc2) Author: Nicolas Petton Date: Wed Apr 1 22:27:47 2015 +0200 * etc/AUTHORS: Update the AUTHORS file diff --git a/etc/AUTHORS b/etc/AUTHORS index b79396b..77fd472 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -58,7 +58,7 @@ Adrian Robert: co-wrote ns-win.el and changed nsterm.m nsfns.m nsfont.m nsterm.h nsmenu.m configure.ac src/Makefile.in macos.texi README config.in emacs.c font.c keyboard.c nsgui.h nsimage.m xdisp.c image.c lib-src/Makefile.in lisp.h menu.c - Makefile.in and 79 other files + Makefile.in and 78 other files Agustín Martín: changed ispell.el flyspell.el fixit.texi @@ -366,6 +366,8 @@ and changed org.el org-agenda.el org.texi ox-html.el org-clock.el Ben A. Mesander: co-wrote erc-dcc.el +Ben Bacarisse: changed nnmh.el + Ben Harris: changed configure.ac Ben Key: changed w32.c w32fns.c w32menu.c configure.bat INSTALL @@ -425,7 +427,7 @@ and changed mh-customize.el mh-search.el mh-alias.el Makefile mh-e.texi mh-identity.el README mh-speed.el mh-init.el mh-acros.el mh-gnus.el mh-unit.el mh-inc.el mh-xemacs-compat.el mh-print.el lisp/Makefile.in image.el mh-tool-bar.el mh-xemacs.el display.texi makefile.w32-in - and 86 other files + and 84 other files Bjorn Solberg: changed nnimap.el @@ -1056,7 +1058,7 @@ Diane Murray: changed erc.el erc-backend.el erc-menu.el erc-button.el erc-track.el erc-match.el erc-nets.el erc-list.el erc-autoaway.el erc-capab.el erc-nickserv.el erc-stamp.el erc-compat.el erc-fill.el erc-goodies.el erc-ibuffer.el erc-log.el erc-nicklist.el url-http.el - Makefile erc-dcc.el and 37 other files + Makefile erc-dcc.el and 36 other files Didier Verna: wrote gnus-diary.el nndiary.el and co-wrote nnml.el @@ -1172,7 +1174,7 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c] and changed xdisp.c msdos.c w32.c w32fns.c fileio.c files.el simple.el display.texi dispnew.c w32proc.c sed1v2.inp src/makefile.w32-in config.bat emacs.c msdos.h dispextern.h term.c process.c - src/Makefile.in info.el mainmake.v2 and 801 other files + src/Makefile.in info.el mainmake.v2 and 802 other files Elias Oltmanns: changed tls.el gnus-agent.el gnus-cite.el gnus-int.el gnus-srvr.el gnus.el nnimap.el @@ -1491,7 +1493,7 @@ Gerd Möllmann: wrote authors.el ebrowse.el jit-lock.el rx.el tooltip.el and changed xdisp.c xterm.c dispnew.c dispextern.h xfns.c xfaces.c window.c keyboard.c lisp.h faces.el alloc.c buffer.c startup.el xterm.h fns.c simple.el term.c configure.ac frame.c xmenu.c emacs.c - and 613 other files + and 612 other files Gergely Nagy: changed erc.el @@ -1850,7 +1852,7 @@ Jason Rumney: wrote w32-vars.el and changed w32fns.c w32term.c w32font.c w32menu.c w32-win.el w32term.h w32.c w32uniscribe.c src/makefile.w32-in w32-fns.el makefile.nt w32console.c w32bdf.c lib-src/makefile.w32-in configure.bat keyboard.c - w32proc.c w32select.c font.c image.c w32font.h and 166 other files + w32proc.c w32select.c font.c image.c w32font.h and 165 other files Jason S. Cornez: changed keyboard.c @@ -1947,7 +1949,7 @@ Jim Kingdon: changed emacs.texi emacsclient.c functions.texi hp300bsd.h Jim Meyering: changed lread.c make-docfile.c w32.c w32font.c copyright.el ebrowse.c emacs.c nsfont.m pop.c term.c xfaces.c xselect.c xterm.c alloc.c artist.el autoinsert.el buffer.h callproc.c character.h - charset.c configure and 56 other files + charset.c configure and 55 other files Jim Paris: changed process.c @@ -2034,7 +2036,7 @@ John Anthony: changed inf-lisp.el ruby-mode.el text-mode.el John Basrai: changed man.el -John F. Carr: changed dired.c +John F. Carr: changed dired.c fontset.c John F. Whitehead: changed mule-cmds.el mule-diag.el @@ -2148,10 +2150,10 @@ Josh Elsasser: changed configure.ac Josh Feinstein: changed erc-join.el erc.el Josh Huber: changed mml-sec.el mml.el message.el gnus-msg.el mml2015.el - nnmail.el ChangeLog ChangeLog.1 gnus-cite.el gnus-delay.el gnus-spec.el - mml1991.el nnultimate.el nnwfm.el gnus-cus.el gnus-smiley.el - gnus-start.el gnus-topic.el gnus.el nnbabyl.el nndiary.el - and 8 other files + nnmail.el gnus-cite.el gnus-delay.el gnus-spec.el mml1991.el + nnultimate.el nnwfm.el gnus-cus.el gnus-smiley.el gnus-start.el + gnus-topic.el gnus.el nnbabyl.el nndiary.el nnfolder.el nnimap.el + and 6 other files Joshua Varner: changed intro.texi @@ -2173,7 +2175,7 @@ Juanma Barranquero: wrote emacs-lock.el frameset.el and changed src/makefile.w32-in subr.el desktop.el config.nt w32fns.c lib-src/makefile.w32-in server.el emacsclient.c files.el simple.el bs.el faces.el help-fns.el org.el w32term.c xdisp.c buffer.c keyboard.c - w32.c ido.el makefile.w32-in and 1129 other files + w32.c ido.el makefile.w32-in and 1128 other files Juergen Kreileder: changed imap.el nnimap.el @@ -2668,7 +2670,7 @@ and changed erc.el erc-dcc.el erc-speak.el Makefile erc-bbdb.el erc-complete.el erc-pcomplete.el erc-chess.el erc-list.el battery.el erc-match.el erc-autojoin.el erc-nets.el erc-nickserv.el erc-ring.el artist.el cpp-root.el db-el.el db-global.el db-javascript.el db.el - and 25 other files + and 26 other files Mark A. Hershberger: changed xml.el nnrss.el mm-url.el cperl-mode.el isearch.el vc-bzr.el NXML-NEWS cc-mode.texi compilation.txt ede.texi @@ -2767,7 +2769,7 @@ Martin Pohlack: changed iimage.el pc-select.el Martin Rudalics: changed window.el window.c windows.texi frame.c xdisp.c help.el w32term.c xterm.c buffer.c w32fns.c cus-start.el dired.el frame.el window.h frames.texi files.el mouse.el subr.el xfns.c - buffers.texi cus-edit.el and 166 other files + buffers.texi cus-edit.el and 167 other files Martin Stjernholm: wrote cc-bytecomp.el and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el @@ -2934,7 +2936,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el erc-list.el erc-compat.el erc-identd.el erc.texi ERC-NEWS erc-bbdb.el erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el - erc-button.el and 63 other files + erc-button.el and 57 other files Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el @@ -3504,7 +3506,7 @@ Reiner Steib: wrote gmm-utils.el gnus-news.el and changed message.el gnus.texi gnus-art.el gnus-sum.el gnus-group.el gnus.el mml.el gnus-faq.texi mm-util.el gnus-score.el message.texi gnus-msg.el gnus-start.el gnus-util.el spam-report.el mm-uu.el spam.el - mm-decode.el files.el gnus-agent.el nnmail.el and 176 other files + mm-decode.el files.el gnus-agent.el nnmail.el and 175 other files Remek Trzaska: changed gnus-ems.el @@ -3821,7 +3823,7 @@ and changed gnus-art.el message.el gnus-sum.el gnus-msg.el gnus.el gnus-agent.el mm-decode.el mm-util.el gnus-group.el mml.el gnus-start.el gnus-util.el mm-view.el nnslashdot.el nnmail.el nntp.el gnus-topic.el gnus-xmas.el rfc2047.el mail-source.el gnus-win.el - and 95 other files + and 93 other files Shigeru Fukaya: wrote bytecomp-tests.el and changed apropos.el byte-opt.el bytecomp.el elint.el rx-new.el ses.el @@ -3903,7 +3905,7 @@ and co-wrote font-lock.el and changed subr.el simple.el lisp.h keyboard.c files.el vc.el bytecomp.el xdisp.c alloc.c eval.c cl-macs.el progmodes/compile.el keymap.c pcvs.el sh-script.el newcomment.el tex-mode.el buffer.c - vc-hooks.el window.c lread.c and 1211 other files + vc-hooks.el window.c lread.c and 1210 other files Stefan Reichör: changed gnus-agent.el commit dd3f56789371c904c53f057b288cdcfc9cc56b25 Author: Michael Albinus Date: Wed Apr 1 17:04:07 2015 +0200 Fix tramp-tests.el * automated/tramp-tests.el (tramp-test06-directory-file-name): Fix docstring and last test. diff --git a/test/ChangeLog b/test/ChangeLog index 4854431..fa3c45d 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-04-01 Michael Albinus + + * automated/tramp-tests.el (tramp-test06-directory-file-name): + Fix docstring and last test. + 2015-04-01 Nicolas Petton * Version 24.5 released. diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 6b0d89f..dca188a 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -558,8 +558,8 @@ shall not contain a timeout." (ert-deftest tramp-test06-directory-file-name () "Check `directory-file-name'. -This checks also `file-name-as-directory', `file-name-directory' -and `file-name-nondirectory'." +This checks also `file-name-as-directory', `file-name-directory', +`file-name-nondirectory' and `unhandled-file-name-directory'." (should (string-equal (directory-file-name "/method:host:/path/to/file") @@ -589,8 +589,7 @@ and `file-name-nondirectory'." (should (string-equal (file-name-nondirectory "/method:host:/path/to/file/") "")) (should-not - (file-remote-p - (unhandled-file-name-directory "/method:host:/path/to/file")))) + (unhandled-file-name-directory "/method:host:/path/to/file"))) (ert-deftest tramp-test07-file-exists-p () "Check `file-exist-p', `write-region' and `delete-file'." commit 1b70aa634c9ce117fed418894b54b1f2647bda1c Author: Michael Albinus Date: Wed Apr 1 09:31:20 2015 +0200 Fix bug#20233, do not merge with master * lisp/net/tramp.el (tramp-handle-unhandled-file-name-directory): Return nil when required by the spec. (Bug#20233) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eb84df7..0b3d7c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-01 Michael Albinus + + * net/tramp.el (tramp-handle-unhandled-file-name-directory): + Return nil when required by the spec. (Bug#20233) + 2015-04-01 Nicolas Petton * Version 24.5 released. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index dddf501..79242a4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3355,10 +3355,11 @@ User is always nil." (defun tramp-handle-unhandled-file-name-directory (_filename) "Like `unhandled-file-name-directory' for Tramp files." - ;; With Emacs 23, we could simply return `nil'. But we must keep it - ;; for backward compatibility. "~/" cannot be returned, because - ;; there might be machines without a HOME directory (like hydra). - "/") + ;; Starting with Emacs 23, we must simply return `nil'. But we must + ;; keep backward compatibility, also with XEmacs. "~/" cannot be + ;; returned, because there might be machines without a HOME + ;; directory (like hydra). + (and (< emacs-major-version 23) "/")) (defun tramp-handle-set-visited-file-modtime (&optional time-list) "Like `set-visited-file-modtime' for Tramp files."