commit 133848247344af93a710d050f064019a40fde801 (HEAD, refs/remotes/origin/master) Author: Martin Rudalics Date: Sat Jun 20 10:16:07 2015 +0200 In ‘window-state-put’ undedicate target window. (Bug#20848) * lisp/window.el (window-state-put): Undedicate target window before putting STATE into it. (Bug#20848) diff --git a/lisp/window.el b/lisp/window.el index fad9b2f..6e45711 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5375,6 +5375,8 @@ windows can get as small as `window-safe-min-height' and root)))) (delete-other-windows-internal window root))) + (set-window-dedicated-p window nil) + (let* ((frame (window-frame window)) (head (car state)) ;; We check here (1) whether the total sizes of root window of commit f95211e9a40b1c7d1beff0e15aa67450f80bd8bb Merge: b9373ac a5e6f33 Author: Paul Eggert Date: Fri Jun 19 16:45:50 2015 -0700 Merge from origin/emacs-24 a5e6f33 Fixes: debbugs:20832 b9f02cf Fixes: debbugs:20832 commit b9373ac26ad75fe38638a51eea54944163cc1c38 Author: Eli Zaretskii Date: Fri Jun 19 20:47:44 2015 +0300 Fix file-in-directory-p when the directory is UNC * lisp/files.el (file-in-directory-p): Support files and directories that begin with "//". (Bug#20844) diff --git a/lisp/files.el b/lisp/files.el index 4656ada..540d613 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5279,7 +5279,12 @@ Return nil if DIR is not an existing directory." dir (file-truename dir)) (let ((ls1 (split-string file "/" t)) (ls2 (split-string dir "/" t)) - (root (if (string-match "\\`/" file) "/" "")) + (root + (cond + ;; A UNC on Windows systems, or a "super-root" on Apollo. + ((string-match "\\`//" file) "//") + ((string-match "\\`/" file) "/") + (t ""))) (mismatch nil)) (while (and ls1 ls2 (not mismatch)) (if (string-equal (car ls1) (car ls2)) commit a5e6f33b4c8222ad62fdd7ff4bb0f8c5fac432c1 (refs/remotes/origin/emacs-24) Author: Stephen Berman Date: Fri Jun 19 17:03:49 2015 +0200 Fixes: debbugs:20832 * lisp/calendar/todo-mode.el (todo-show): Don't visit todo file in the minibuffer. diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 6e97524..c869727 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -672,7 +672,7 @@ corresponding todo file, displaying the corresponding category." todo-filtered-items-mode)))) (if (funcall todo-files-function) (todo-read-file-name "Choose a todo file to visit: " - nil t) + nil t) (user-error "There are no todo files"))) ((and (eq major-mode 'todo-archive-mode) ;; Called noninteractively via todo-quit @@ -732,7 +732,10 @@ corresponding todo file, displaying the corresponding category." (when (or (member file todo-visited) (eq todo-show-first 'first)) (unless (todo-check-file file) (throw 'end nil)) - (set-window-buffer (selected-window) + ;; If todo-show is called from the minibuffer, don't visit + ;; the todo file there. + (set-window-buffer (if (minibufferp) (minibuffer-selected-window) + (selected-window)) (set-buffer (find-file-noselect file 'nowarn))) (if (equal (file-name-extension (buffer-file-name)) "toda") (unless (derived-mode-p 'todo-archive-mode) (todo-archive-mode)) commit b9f02cf65a1b41e486f412e6f98644f298129d55 Author: Nicolas Richard Date: Fri Jun 19 16:57:26 2015 +0200 Fixes: debbugs:20832 * lisp/calendar/todo-mode.el (todo-show): Signal an error if buffer for adding new todo file is empty but modified. diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index dcc960f..6e97524 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -743,6 +743,11 @@ corresponding todo file, displaying the corresponding category." (setq todo-category-number (todo-category-number cat))) ;; If this is a new todo file, add its first category. (when (zerop (buffer-size)) + ;; Don't confuse an erased buffer with a fresh buffer for + ;; adding a new todo file -- it might have been erased by + ;; mistake or due to a bug (e.g. Bug#20832). + (when (buffer-modified-p) + (error "Buffer is empty but modified, please report a bug")) (let (cat-added) (unwind-protect (setq todo-category-number commit ea47568b19e5dc89c48529edfc1ceedee68a5448 Author: Stefan Monnier Date: Fri Jun 19 10:51:22 2015 -0400 (filepos-to-bufferpos): Further tweaks to the utf-16 code * lisp/international/mule-util.el (filepos-to-bufferpos): Fix typo. Move non-exact check to the utf-16 branch (the only one affected). Don't use byte-to-position for the utf-16 case. diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index 9aa64dc..8dd83b4 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@ -355,7 +355,7 @@ QUALITY can be: (pm (save-restriction (widen) (point-min)))) (and (eq type 'utf-8) ;; Any post-read/pre-write conversions mean it's not really UTF-8. - (not (null (coding-system-get coding-system :pos-read-conversion))) + (not (null (coding-system-get coding-system :post-read-conversion))) (setq type 'not-utf-8)) (and (memq type '(charset raw-text undecided)) ;; The following are all of type 'charset', but they are @@ -365,12 +365,6 @@ QUALITY can be: japanese-iso-8bit chinese-big5-hkscs japanese-cp932 korean-cp949))) (setq type 'single-byte)) - ;; Any encoding that's not single-byte and not UTF-8 must use the - ;; 'exact' path if QUALITY is 'exact', because we have no simple - ;; mappings for those cases. - (and (not (memq type '(utf-8 single-byte))) - (eq quality 'exact) - (setq type 'use-exact)) (pcase type (`utf-8 (when (coding-system-get coding-system :bom) @@ -378,19 +372,23 @@ QUALITY can be: (if (= eol 1) (filepos-to-bufferpos--dos (+ pm byte) #'byte-to-position) (byte-to-position (+ pm byte)))) - (`utf-16 + (`single-byte + (if (= eol 1) + (filepos-to-bufferpos--dos (+ pm byte) #'identity) + (+ pm byte))) + ((and `utf-16 + ;; FIXME: For utf-16, we could use the same approach as used for + ;; dos EOLs (counting the number of non-BMP chars instead of the + ;; number of lines). + (guard (not (eq quality 'exact)))) ;; Account for BOM, which is always 2 bytes in UTF-16. (when (coding-system-get coding-system :bom) - (setq byte (- byte 2))) + (setq byte (max 0 (- byte 2)))) ;; In approximate mode, assume all characters are within the ;; BMP, i.e. take up 2 bytes. (setq byte (/ byte 2)) (if (= eol 1) (filepos-to-bufferpos--dos (+ pm byte) #'identity) - (byte-to-position (+ pm byte)))) - (`single-byte - (if (= eol 1) - (filepos-to-bufferpos--dos (+ pm byte) #'identity) (+ pm byte))) (_ (pcase quality commit 06d503faebf90376b9535b533b48550f88e6c70f Author: Glenn Morris Date: Fri Jun 19 06:20:41 2015 -0400 ; Auto-commit of loaddefs files. diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 8387d81..662bc0a 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -978,7 +978,7 @@ Optional argument GROUP is the sub-group of slots to display. ;;;*** -;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "4b96541a14ecb2ac82ce5da7da79fd88") +;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "899e10c7883c4aac5cefcc223794e8f9") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\