------------------------------------------------------------ revno: 116446 fixes bug: http://debbugs.gnu.org/16749 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2014-02-15 05:16:46 +0100 message: frameset.el (frameset--jump-to-register): Check that buffer is live (bug#16749). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-15 03:58:38 +0000 +++ lisp/ChangeLog 2014-02-15 04:16:46 +0000 @@ -1,3 +1,8 @@ +2014-02-15 Juanma Barranquero + + * frameset.el (frameset--jump-to-register): Check that buffer is live + (bug#16749). + 2014-02-15 Glenn Morris * info.el (info-initialize): Revert 2014-01-10 change. === modified file 'lisp/frameset.el' --- lisp/frameset.el 2014-02-11 20:48:23 +0000 +++ lisp/frameset.el 2014-02-15 04:16:46 +0000 @@ -1213,15 +1213,14 @@ :filters frameset-session-filter-alist :reuse-frames (if delete t :keep)) (mapc #'iconify-frame iconify-list) - (let ((frame (frameset-frame-with-id (aref data 1)))) + (let ((frame (frameset-frame-with-id (aref data 1))) + buffer window) (when frame (select-frame-set-input-focus frame) - (let* ((position (aref data 2)) - (buffer (marker-buffer position)) - (window (get-buffer-window buffer frame))) - (when (and window (window-live-p window)) - (set-frame-selected-window frame window) - (with-current-buffer buffer (goto-char position)))))))) + (when (and (buffer-live-p (setq buffer (marker-buffer (aref data 2)))) + (window-live-p (setq window (get-buffer-window buffer frame)))) + (set-frame-selected-window frame window) + (with-current-buffer buffer (goto-char (aref data 2)))))))) ;;;###autoload (defun frameset-to-register (register) ------------------------------------------------------------ revno: 116445 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-02-14 19:58:38 -0800 message: * lisp/info.el (info-initialize): Revert 2014-01-10 change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-14 07:36:42 +0000 +++ lisp/ChangeLog 2014-02-15 03:58:38 +0000 @@ -1,3 +1,7 @@ +2014-02-15 Glenn Morris + + * info.el (info-initialize): Revert 2014-01-10 change. + 2014-02-14 Glenn Morris * replace.el (map-query-replace-regexp) === modified file 'lisp/info.el' --- lisp/info.el 2014-02-10 01:34:22 +0000 +++ lisp/info.el 2014-02-15 03:58:38 +0000 @@ -732,14 +732,6 @@ (Info-default-dirs)) (split-string path sep)) (Info-default-dirs)))) - ;; If we are running uninstalled, our own Info files should - ;; always come first. If INFOPATH was set, they might not. - (and path - installation-directory - (let ((dir (expand-file-name "info/" installation-directory))) - (when (file-directory-p dir) - (setq Info-directory-list (delete dir Info-directory-list)) - (push dir Info-directory-list)))) ;; For a self-contained (ie relocatable) NS build, AFAICS we ;; always want the included info directory to be at the head of ;; the search path, unless it's already in INFOPATH somewhere. ------------------------------------------------------------ revno: 116444 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-02-14 14:08:53 -0500 message: * lisp/replace.el (read-regexp): Fix typo in earlier doc change. diff: === modified file 'lisp/replace.el' --- lisp/replace.el 2014-02-14 07:36:42 +0000 +++ lisp/replace.el 2014-02-14 19:08:53 +0000 @@ -668,7 +668,7 @@ "Read and return a regular expression as a string. Prompt with the string PROMPT. If PROMPT ends in \":\" (followed by optional whitespace), use it as-is. Otherwise, add \": \" to the end, -possible preceded by the default result (see below). +possibly preceded by the default result (see below). The optional argument DEFAULTS can be either: nil, a string, a list of strings, or a symbol. We use DEFAULTS to construct the default ------------------------------------------------------------ revno: 116443 committer: Paul Eggert branch nick: trunk timestamp: Fri 2014-02-14 08:11:11 -0800 message: * character.h: Fix misspelling of file name in comment. diff: === modified file 'src/character.h' --- src/character.h 2013-12-14 21:36:44 +0000 +++ src/character.h 2014-02-14 16:11:11 +0000 @@ -613,7 +613,7 @@ /* Data type for Unicode general category. The order of members must be in sync with the 8th element of the - member of unidata-prop-alist (in admin/unidata/unidata-getn.el) for + member of unidata-prop-alist (in admin/unidata/unidata-gen.el) for Unicode character property `general-category'. */ typedef enum { ------------------------------------------------------------ revno: 116442 fixes bug: http://debbugs.gnu.org/16717 committer: Paul Eggert branch nick: trunk timestamp: Fri 2014-02-14 00:05:18 -0800 message: * Makefile.in (install-arch-indep): Allow ' ' in destdir. This fixes a bug in the previous change. Also, use $(SHELL) rather than sh, as that's more likely to be portable. diff: === modified file 'ChangeLog' --- ChangeLog 2014-02-13 18:59:24 +0000 +++ ChangeLog 2014-02-14 08:05:18 +0000 @@ -1,3 +1,9 @@ +2014-02-14 Paul Eggert + + * Makefile.in (install-arch-indep): Allow ' ' in destdir (Bug#16717). + This fixes a bug in the previous change. Also, use $(SHELL) + rather than sh, as that's more likely to be portable. + 2014-02-13 Paul Eggert * Makefile.in (install-arch-indep): Simplify (Bug#16717). === modified file 'Makefile.in' --- Makefile.in 2014-02-13 18:59:24 +0000 +++ Makefile.in 2014-02-14 08:05:18 +0000 @@ -614,8 +614,9 @@ ${write_subdir} || true [ -z "${GZIP_PROG}" ] || { \ echo "Compressing *.el ..." && \ - find "$(DESTDIR)${lispdir}" -name '*.elc' -exec sh -c \ - '${GZIP_PROG} -9n `expr "$$@" : "\\(.*\\)c"`' dummy '{}' ';'; \ + cd "$(DESTDIR)${lispdir}" && \ + find . -name '*.elc' -exec $(SHELL) -c \ + '${GZIP_PROG} -9n `expr "$$1" : "\\(.*\\)c"`' dummy '{}' ';'; \ } -chmod -R a+r "$(DESTDIR)${datadir}/emacs/${version}" ${COPYDESTS}