commit a283d655db88cdcc8cb53d8e2578e1cdf751c84b (HEAD, refs/remotes/origin/master) Author: Noam Postavsky Date: Tue Nov 29 18:56:08 2016 -0500 Fix previous commit * lisp/vc/diff-mode.el (diff-refine-hunk): Make sure to go to beginning of hunk before calling `diff-hunk-style'. diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 6ddadb3..5b48c8d 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -2065,14 +2065,13 @@ For use in `add-log-current-defun-function'." (require 'smerge-mode) (save-excursion (let* ((hunk-bounds (diff-bounds-of-hunk)) - (style (diff-hunk-style)) ;Skips the hunk header as well. + (style (progn (goto-char (car hunk-bounds)) + (diff-hunk-style))) ;Skips the hunk header as well. (beg (point)) + (end (cadr hunk-bounds)) (props-c '((diff-mode . fine) (face diff-refine-changed))) (props-r '((diff-mode . fine) (face diff-refine-removed))) - (props-a '((diff-mode . fine) (face diff-refine-added))) - ;; Be careful to go back to `start' so diff-end-of-hunk gets - ;; to read the hunk header's line info. - (end (goto-char (cadr hunk-bounds)))) + (props-a '((diff-mode . fine) (face diff-refine-added)))) (remove-overlays beg end 'diff-mode 'fine) commit 61c6a10e3110490dadac4577cc540053341ff25c Author: Noam Postavsky Date: Tue Nov 29 18:52:41 2016 -0500 * lisp/vc/diff-mode.el (diff-refine-hunk): Remove redundant variable. diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index c9a5f89..6ddadb3 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -2065,7 +2065,6 @@ For use in `add-log-current-defun-function'." (require 'smerge-mode) (save-excursion (let* ((hunk-bounds (diff-bounds-of-hunk)) - (start (goto-char (car hunk-bounds))) (style (diff-hunk-style)) ;Skips the hunk header as well. (beg (point)) (props-c '((diff-mode . fine) (face diff-refine-changed))) commit fa525b7dd6b64da095405f3710fb04997dcd371c Author: Glenn Morris Date: Tue Nov 29 16:57:05 2016 -0500 Use archive-mode for .cbr files * lisp/files.el (auto-mode-alist): Add cbr. (Bug#24994) diff --git a/lisp/files.el b/lisp/files.el index c56ff1d..84f8dc7 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2508,8 +2508,8 @@ since only a single case-insensitive search through the alist is made." ;; The list of archive file extensions should be in sync with ;; `auto-coding-alist' with `no-conversion' coding system. ("\\.\\(\ -arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\ -ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) +arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|cbr\\|7z\\|\ +ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CBR\\|7Z\\)\\'" . archive-mode) ("\\.oxt\\'" . archive-mode) ;(Open|Libre)Office extensions. ("\\.\\(deb\\|[oi]pk\\)\\'" . archive-mode) ; Debian/Opkg packages. ;; Mailer puts message to be edited in commit 36dbdedefa2372870313e219164ff9b3b7712e9e Author: Paul Eggert Date: Tue Nov 29 13:12:24 2016 -0800 Pacify Sun C 5.14 * src/lisp.h (enum Lisp_Save_Type): Put SAVE_UNUSED, SAVED_INTEGER, SAVE_FUNCPOINTER, SAVE_POINTER, and SAVE_OBJECT into this enum rather than into an anonymous enum. This avoids diagnostics from Sun C 5.14 and is a bit clearer anyway. diff --git a/src/lisp.h b/src/lisp.h index b4ddad1..6fbedd3 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2112,18 +2112,8 @@ struct Lisp_Overlay Lisp_Object plist; }; -/* Types of data which may be saved in a Lisp_Save_Value. */ - -enum - { - SAVE_UNUSED, - SAVE_INTEGER, - SAVE_FUNCPOINTER, - SAVE_POINTER, - SAVE_OBJECT - }; - -/* Number of bits needed to store one of the above values. */ +/* Number of bits needed to store one of the values + SAVE_UNUSED..SAVE_OBJECT. */ enum { SAVE_SLOT_BITS = 3 }; /* Number of slots in a save value where save_type is nonzero. */ @@ -2133,8 +2123,15 @@ enum { SAVE_VALUE_SLOTS = 4 }; enum { SAVE_TYPE_BITS = SAVE_VALUE_SLOTS * SAVE_SLOT_BITS + 1 }; +/* Types of data which may be saved in a Lisp_Save_Value. */ + enum Lisp_Save_Type { + SAVE_UNUSED, + SAVE_INTEGER, + SAVE_FUNCPOINTER, + SAVE_POINTER, + SAVE_OBJECT, SAVE_TYPE_INT_INT = SAVE_INTEGER + (SAVE_INTEGER << SAVE_SLOT_BITS), SAVE_TYPE_INT_INT_INT = (SAVE_INTEGER + (SAVE_TYPE_INT_INT << SAVE_SLOT_BITS)), @@ -2152,6 +2149,12 @@ enum Lisp_Save_Type SAVE_TYPE_MEMORY = SAVE_TYPE_PTR_INT + (1 << (SAVE_TYPE_BITS - 1)) }; +/* SAVE_SLOT_BITS must be large enough to represent these values. */ +verify (((SAVE_UNUSED | SAVE_INTEGER | SAVE_FUNCPOINTER + | SAVE_POINTER | SAVE_OBJECT) + >> SAVE_SLOT_BITS) + == 0); + /* Special object used to hold a different values for later use. This is mostly used to package C integers and pointers to call commit 9221b77c9962cc5a4cb7310b54b5b3c2b1faa469 Author: Paul Eggert Date: Tue Nov 29 09:19:42 2016 -0800 Adjust lwlib to recent config.h change * lwlib/lwlib-Xaw.c: Include for 'abort' (Bug#24506). diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index 9bd84ef..f153407 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -21,6 +21,7 @@ along with GNU Emacs. If not, see . */ #include #include +#include #include #include commit 074d5cd873014d97bf84a993ea711b39368810fe Author: Paul Eggert Date: Tue Nov 29 08:38:17 2016 -0800 * src/eval.c (clobbered_eassert): Check E's syntax. diff --git a/src/eval.c b/src/eval.c index 884e1eb..bbc1518 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1057,11 +1057,11 @@ usage: (catch TAG BODY...) */) return internal_catch (tag, Fprogn, XCDR (args)); } -/* Assert that E is true, as a comment only. Use this instead of +/* Assert that E is true, but do not evaluate E. Use this instead of eassert (E) when E contains variables that might be clobbered by a longjmp. */ -#define clobbered_eassert(E) ((void) 0) +#define clobbered_eassert(E) verify (sizeof (E) != 0) /* Set up a catch, then call C function FUNC on argument ARG. FUNC should return a Lisp_Object. commit bb4212d10b7023bb52d3acd141f785b75ffa2f2c Author: Michael Albinus Date: Tue Nov 29 15:51:38 2016 +0100 Improve user retrieval from auth-source in Tramp * lisp/net/tramp.el (tramp-read-passwd, tramp-clear-passwd): Use user for auth-source request only in case it exists. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 52a4be8..af08cf7 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4218,7 +4218,8 @@ Invokes `password-read' if available, `read-passwd' else." (setq auth-info (auth-source-search :max 1 - :user (or tramp-current-user t) + (and tramp-current-user :user) + tramp-current-user :host tramp-current-host :port tramp-current-method :require @@ -4262,7 +4263,7 @@ Invokes `password-read' if available, `read-passwd' else." ;; since Emacs 24.1, it has been replaced by `auth-source-forget'. (if (fboundp 'auth-source-forget) (auth-source-forget - `(:max 1 :user ,(or user t) :host ,host :port ,method)) + `(:max 1 ,(and user :user) ,user :host ,host :port ,method)) (tramp-compat-funcall 'auth-source-forget-user-or-password "password" host method)) (password-cache-remove (tramp-make-tramp-file-name method user host "")))) commit e42b964c1246562a7c2345e528bd0a2fe5448015 Author: Katsumi Yamaoka Date: Tue Nov 29 10:20:51 2016 +0000 shr.el: Don't render a normal table twice * lisp/net/shr.el (shr-collect-extra-strings-in-table): Don't render a table if it is called for the first time, IOW, recognize it to never be invalid (bug#25051). diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 75e5580..8b1495e 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1917,7 +1917,7 @@ flags that control whether to collect or render objects." ;; FLAGS becomes (t . nil) if a clause is found in the children ;; of DOM, and becomes (t . t) if a or a clause is found ;; and the car is t then. When a clause is found, FLAGS - ;; becomes nil if the cdr is t then. But if the cdr is nil then, + ;; becomes nil if the cdr is t then. But if FLAGS is (t . nil) then, ;; it renders the
. (cl-loop for child in (dom-children dom) with recurse with tag do (setq recurse nil) @@ -1945,10 +1945,10 @@ flags that control whether to collect or render objects." else if (eq tag 'table) if (cdr flags) do (setq flags nil) - else + else if (car flags) do (setq recurse nil) (shr-tag-table child) - end end end end end end end end end + end end end end end end end end end end when recurse append (shr-collect-extra-strings-in-table child flags)))