commit 227e996946d4629fa8f6d665564a37668290c87f (HEAD, refs/remotes/origin/master) Author: Daniel Colascione Date: Mon Aug 3 20:06:04 2015 -0700 Improve ansi-color filtering of unrecognized escape sequences * lisp/ansi-color.el (ansi-color-drop-regexp): Recognize mode-setting escape sequences. (ansi-color-filter-apply): Filter out unrecognized escape sequences (ansi-color-apply): Filter out unrecognized escape sequences diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 5088c3d..2f3b506 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -154,7 +154,7 @@ foreground and background colors, respectively." "Regexp that matches SGR control sequences.") (defconst ansi-color-drop-regexp - "\033\\[\\([ABCDsuK]\\|[12][JK]\\|=[0-9]+[hI]\\|[0-9;]*[Hf]\\)" + "\033\\[\\([ABCDsuK]\\|[12][JK]\\|=[0-9]+[hI]\\|[0-9;]*[Hf]\\|\\?[0-9]+[hl]\\)" "Regexp that matches ANSI control sequences to silently drop.") (defconst ansi-color-parameter-regexp "\\([0-9]*\\)[m;]" @@ -261,7 +261,11 @@ This function can be added to `comint-preoutput-filter-functions'." ;; find the next escape sequence (while (setq end (string-match ansi-color-regexp string start)) (setq result (concat result (substring string start end)) - start (match-end 0))) + start (match-end 0))) + ;; eliminate unrecognized escape sequences + (while (string-match ansi-color-drop-regexp string) + (setq string + (replace-match "" nil nil string))) ;; save context, add the remainder of the string to the result (let (fragment) (if (string-match "\033" string start) @@ -327,6 +331,10 @@ This function can be added to `comint-preoutput-filter-functions'." (when codes (put-text-property start (length string) 'font-lock-face (ansi-color--find-face codes) string)) + ;; eliminate unrecognized escape sequences + (while (string-match ansi-color-drop-regexp string) + (setq string + (replace-match "" nil nil string))) ;; save context, add the remainder of the string to the result (let (fragment) (if (string-match "\033" string start) commit 8a4b8ae32f66b00d0730490240b87e9b9b1cfa51 Author: Artur Malabarba Date: Tue Aug 4 00:39:04 2015 +0100 * lisp/emacs-lisp/package.el (package-menu-mode-map): Convert menu definitions to `easy-menu-define', improve a couple to account for async, and add a couple of new commands. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index aeb8c65..60977a7 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2382,8 +2382,7 @@ will be deleted." ;;;; Package menu mode. (defvar package-menu-mode-map - (let ((map (make-sparse-keymap)) - (menu-map (make-sparse-keymap "Package"))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map tabulated-list-mode-map) (define-key map "\C-m" 'package-menu-describe-package) (define-key map "u" 'package-menu-mark-unmark) @@ -2399,60 +2398,41 @@ will be deleted." (define-key map "H" #'package-menu-hide-package) (define-key map "?" 'package-menu-describe-package) (define-key map "(" #'package-menu-toggle-hiding) - (define-key map [menu-bar package-menu] (cons "Package" menu-map)) - (define-key menu-map [mq] - '(menu-item "Quit" quit-window - :help "Quit package selection")) - (define-key menu-map [s1] '("--")) - (define-key menu-map [mn] - '(menu-item "Next" next-line - :help "Next Line")) - (define-key menu-map [mp] - '(menu-item "Previous" previous-line - :help "Previous Line")) - (define-key menu-map [s2] '("--")) - (define-key menu-map [mu] - '(menu-item "Unmark" package-menu-mark-unmark - :help "Clear any marks on a package and move to the next line")) - (define-key menu-map [munm] - '(menu-item "Unmark Backwards" package-menu-backup-unmark - :help "Back up one line and clear any marks on that package")) - (define-key menu-map [md] - '(menu-item "Mark for Deletion" package-menu-mark-delete - :help "Mark a package for deletion and move to the next line")) - (define-key menu-map [mi] - '(menu-item "Mark for Install" package-menu-mark-install - :help "Mark a package for installation and move to the next line")) - (define-key menu-map [mupgrades] - '(menu-item "Mark Upgradable Packages" package-menu-mark-upgrades - :help "Mark packages that have a newer version for upgrading")) - (define-key menu-map [s3] '("--")) - (define-key menu-map [mf] - '(menu-item "Filter Package List..." package-menu-filter - :help "Filter package selection (q to go back)")) - (define-key menu-map [mg] - '(menu-item "Update Package List" revert-buffer - :help "Update the list of packages")) - (define-key menu-map [mr] - '(menu-item "Refresh Package List" package-menu-refresh - :help "Download the ELPA archive")) - (define-key menu-map [s4] '("--")) - (define-key menu-map [mt] - '(menu-item "Mark Obsolete Packages" package-menu-mark-obsolete-for-deletion - :help "Mark all obsolete packages for deletion")) - (define-key menu-map [mx] - '(menu-item "Execute Actions" package-menu-execute - :help "Perform all the marked actions")) - (define-key menu-map [s5] '("--")) - (define-key menu-map [mh] - '(menu-item "Help" package-menu-quick-help - :help "Show short key binding help for package-menu-mode")) - (define-key menu-map [mc] - '(menu-item "Describe Package" package-menu-describe-package - :help "Display information about this package")) map) "Local keymap for `package-menu-mode' buffers.") +(easy-menu-define package-menu-mode-menu package-menu-mode-map + "Menu for `package-menu-mode'." + `("Package" + ["Describe Package" package-menu-describe-package :help "Display information about this package"] + ["Help" package-menu-quick-help :help "Show short key binding help for package-menu-mode"] + "--" + ["Refresh Package List" package-menu-refresh + :help "Redownload the ELPA archive" + :active (not package--downloads-in-progress)] + ["Redisplay buffer" revert-buffer :help "Update the buffer with current list of packages"] + ["Execute Marked Actions" package-menu-execute :help "Perform all the marked actions"] + + "--" + ["Mark All Available Upgrades" package-menu-mark-upgrades + :help "Mark packages that have a newer version for upgrading" + :active (not package--downloads-in-progress)] + ["Mark All Obsolete for Deletion" package-menu-mark-obsolete-for-deletion :help "Mark all obsolete packages for deletion"] + ["Mark for Install" package-menu-mark-install :help "Mark a package for installation and move to the next line"] + ["Mark for Deletion" package-menu-mark-delete :help "Mark a package for deletion and move to the next line"] + ["Unmark" package-menu-mark-unmark :help "Clear any marks on a package and move to the next line"] + + "--" + ["Filter Package List" package-menu-filter :help "Filter package selection (q to go back)"] + ["Hide by Regexp" package-menu-hide-package :help "Permanently hide all packages matching a regexp"] + ["Display Older Versions" package-menu-toggle-hiding + :style toggle :selected (not package-menu--hide-packages) + :help "Display package even if a newer version is already installed"] + + "--" + ["Quit" quit-window :help "Quit package selection"] + ["Customize" (customize-group 'package)])) + (defvar package-menu--new-package-list nil "List of newly-available packages since `list-packages' was last called.") commit 13e71e5ef38581661cf132421a140b513f90031a Author: Jürgen Hötzel Date: Mon Aug 3 19:40:25 2015 +0200 * lisp/net/tramp-cache.el (tramp-set-file-property): Fix code typo. diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index f777468..f13eee2 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -157,7 +157,7 @@ Returns VALUE." ;; Unify localname. Remove hop from vector. (setq key (copy-sequence key)) (aset key 3 (tramp-run-real-handler 'directory-file-name (list file))) -p (aset key 4 nil) + (aset key 4 nil) (let ((hash (tramp-get-hash-table key))) ;; We put the timestamp there. (puthash property (cons (current-time) value) hash) commit 4e1bdd4494ef31c8716a125a86f6d6b8e2555ece Author: Ingo Lohmar Date: Mon Aug 3 18:49:55 2015 +0200 Add new 'calendar-weekend-days' option Make the days receiving the `calendar-weekend-header' face freely customizable, as they differ by region/culture. * doc/emacs/calendar.texi: Document the new variable. * lisp/calendar/calendar.el (calendar-generate-month): New variable calendar-weekend-days to customize day header fontification. diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 6b21dda..2ab0ff3 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -177,10 +177,13 @@ repeat count indicating how many weeks, months, or years to move backward or forward. @vindex calendar-week-start-day +@vindex calendar-weekend-days @cindex weeks, which day they start on @cindex calendar, first day of week By default, weeks begin on Sunday. To make them begin on Monday -instead, set the variable @code{calendar-week-start-day} to 1. +instead, set the variable @code{calendar-week-start-day} to 1. To +change which day headers are highlighted as weekend days, set the +variable @code{calendar-weekend-days} @node Specified Dates @subsection Specified Dates diff --git a/etc/NEWS b/etc/NEWS index e384d17..0a33a6e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -546,6 +546,11 @@ See `diary-chinese-list-entries' and `diary-chinese-mark-entries'. *** The option `calendar-mode-line-format' can now be nil, which means to do nothing special with the mode line in calendars. ++++ +*** New option `calendar-weekend-days'. +The option customizes which day headers receive the +`calendar-weekend-header' face. + --- *** Many items obsolete since at least version 23.1 have been removed. The majority were function/variable/face aliases, too numerous to list here.