commit 453f883ef81388c39193b9289ef703954e9bc270 (HEAD, refs/remotes/origin/master) Author: Andreas Schwab Date: Thu Jul 14 10:26:24 2016 +0200 Fix configure summary for hybrid malloc configurations * configure.ac ("$hybrid_malloc" = yes): Set GNU_MALLOC to no, parenthesize value of GNU_MALLOC_reason. diff --git a/configure.ac b/configure.ac index aaddfcd..dd1af5b 100644 --- a/configure.ac +++ b/configure.ac @@ -2177,8 +2177,8 @@ elif test "$hybrid_malloc" = yes; then AC_DEFINE(HYBRID_MALLOC, 1, [Define to use gmalloc before dumping and the system malloc after.]) HYBRID_MALLOC=1 - GNU_MALLOC= - GNU_MALLOC_reason="only before dumping" + GNU_MALLOC=no + GNU_MALLOC_reason=" (only before dumping)" GMALLOC_OBJ=gmalloc.o VMLIMIT_OBJ= else commit a8e1414c0d66903884059361ecc8ec70da37cf35 Author: Stephen Berman Date: Thu Jul 14 09:55:28 2016 +0200 Fix delete-duplicate-lines * lisp/sort.el (delete-duplicate-lines): Delete duplicate first line when operating backward (bug#23863). diff --git a/lisp/sort.el b/lisp/sort.el index 4d7311f..8bc7138 100644 --- a/lisp/sort.el +++ b/lisp/sort.el @@ -596,7 +596,7 @@ is non-nil, it also prints a message describing the number of deletions." (equal current-prefix-arg '(64)) t))) (let ((lines (unless adjacent (make-hash-table :test 'equal))) - line prev-line + line prev-line first-line (count 0) (beg (copy-marker beg)) (end (copy-marker end))) @@ -604,8 +604,9 @@ is non-nil, it also prints a message describing the number of deletions." (goto-char (if reverse end beg)) (if (and reverse (bolp)) (forward-char -1)) (while (if reverse - (and (> (point) beg) (not (bobp))) + (not first-line) (and (< (point) end) (not (eobp)))) + (setq first-line (and reverse (or (<= (point) beg) (bobp)))) (setq line (buffer-substring-no-properties (line-beginning-position) (line-end-position))) (if (and keep-blanks (string= "" line)) commit ff0ec6fd4d4779322aefa58df7329e47eb74bf72 Author: Andreas Schwab Date: Thu Jul 14 09:29:17 2016 +0200 Remove unused SHEAP_OBJ * Makefile.in (base_obj): Remove $(SHEAP_OBJ). diff --git a/src/Makefile.in b/src/Makefile.in index 8639eff..89f7a92 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -407,7 +407,6 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ $(XWIDGETS_OBJ) \ profiler.o decompress.o \ $(if $(HYBRID_MALLOC),sheap.o) \ - $(SHEAP_OBJ) \ $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \ $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) obj = $(base_obj) $(NS_OBJC_OBJ) commit 288ba2d406d6277720463f4057cb74534abcec96 Author: Katsumi Yamaoka Date: Thu Jul 14 02:19:24 2016 +0000 * lisp/gnus/mm-decode.el (mm-convert-shr-links): Use shr-image-map instead of shr-map (bug#23964). diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index c653d73..c503953 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1836,7 +1836,6 @@ If RECURSIVE, search recursively." (delete-region ,(point-min-marker) ,(point-max-marker)))))))) -(defvar shr-map) (defvar shr-image-map) (autoload 'widget-convert-button "wid-edit") @@ -1852,7 +1851,7 @@ If RECURSIVE, search recursively." (widget-convert-button 'url-link start end :help-echo (get-text-property start 'help-echo) - :keymap (setq keymap (copy-keymap shr-map)) + :keymap (setq keymap (copy-keymap shr-image-map)) (get-text-property start 'shr-url)) ;; Remove keymap that `shr-urlify' adds. (put-text-property start end 'keymap nil) commit d2533d72680f2c14730cf8699bb2cdd18eba4365 Author: Stefan Monnier Date: Wed Jul 13 11:08:21 2016 -0400 * lisp/mouse.el (mouse): Consolidate group definition here * lisp/cus-edit.el (mouse): Remove both group definitions. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 60d07f9..ef12745 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -197,10 +197,6 @@ :link '(custom-manual "(emacs)Emulation") :group 'editing) -(defgroup mouse nil - "Mouse support." - :group 'editing) - (defgroup outlines nil "Support for hierarchical outlining." :group 'wp) @@ -406,10 +402,6 @@ "Input from the keyboard." :group 'environment) -(defgroup mouse nil - "Input from the mouse." - :group 'environment) - (defgroup menu nil "Input from the menus." :group 'environment) diff --git a/lisp/mouse.el b/lisp/mouse.el index f595326..75b13c4 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -34,6 +34,11 @@ ;; Indent track-mouse like progn. (put 'track-mouse 'lisp-indent-function 0) +(defgroup mouse nil + "Input from the mouse." ;; "Mouse support." + :group 'environment + :group 'editing) + (defcustom mouse-yank-at-point nil "If non-nil, mouse yank commands yank at point instead of at click." :type 'boolean commit 96bd07a3226700156fa7d5ec20e9bd6550c95057 Author: Chris Feng Date: Wed Jul 13 19:52:10 2016 +0800 Include versioned preloaded libraries in `package--builtin-versions' * lisp/emacs-lisp/autoload.el (update-directory-autoloads): Do not exclude preloaded libraries or remove entries generated for them. (autoload-generate-file-autoloads): Do not generate autoload statements for preloaded libraries. diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 6473e31..fbb08fc 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -736,20 +736,22 @@ FILE's modification time." package--builtin-versions)) (princ "\n"))))) - (goto-char (point-min)) - (while (not (eobp)) - (skip-chars-forward " \t\n\f") - (cond - ((looking-at (regexp-quote generate-autoload-cookie)) - ;; If not done yet, figure out where to insert this text. - (unless output-start - (setq output-start (autoload--setup-output - otherbuf outbuf absfile load-name))) - (autoload--print-cookie-text output-start load-name file)) - ((looking-at ";") - ;; Don't read the comment. - (forward-line 1)) - (t + ;; Do not insert autoload entries for excluded files. + (unless (member absfile autoload-excludes) + (goto-char (point-min)) + (while (not (eobp)) + (skip-chars-forward " \t\n\f") + (cond + ((looking-at (regexp-quote generate-autoload-cookie)) + ;; If not done yet, figure out where to insert this text. + (unless output-start + (setq output-start (autoload--setup-output + otherbuf outbuf absfile load-name))) + (autoload--print-cookie-text output-start load-name file)) + ((looking-at ";") + ;; Don't read the comment. + (forward-line 1)) + (t ;; Avoid (defvar ) by requiring a trailing space. ;; Also, ignore this prefix business ;; for ;;;###tramp-autoload and friends. @@ -767,8 +769,8 @@ FILE's modification time." "define-erc-response-handler" "defun-rcirc-command")))) (push (match-string 2) defs)) - (forward-sexp 1) - (forward-line 1)))))) + (forward-sexp 1) + (forward-line 1))))))) (when (and autoload-compute-prefixes defs) ;; This output needs to always go in the main loaddefs.el, @@ -1058,9 +1060,7 @@ write its autoloads into the specified file instead." ((not (stringp file))) ((or (not (file-exists-p file)) ;; Remove duplicates as well, just in case. - (member file done) - ;; If the file is actually excluded. - (member (expand-file-name file) autoload-excludes)) + (member file done)) ;; Remove the obsolete section. (setq changed t) (autoload-remove-section (match-beginning 0))) @@ -1086,7 +1086,6 @@ write its autoloads into the specified file instead." (let ((no-autoloads-time (or last-time '(0 0 0 0))) file-time) (dolist (file files) (cond - ((member (expand-file-name file) autoload-excludes) nil) ;; Passing nil as second argument forces ;; autoload-generate-file-autoloads to look for the right ;; spot where to insert each autoloads section.