procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-25

Browse source 
71fb0e0 Improve last change to vc-git-mode-line-string
6858e77 Todo mode doc bug fix
e55d0db Fix revision calculation in vc-git-mode-line-string
ca87b34 ; Fix errant revert ccb75d7
40bfebe Add Python 3.5 keyword "await"
fa7886a Add new keywords of Python 3.5
ccb75d7 Partially revert previous change.
8ee168a ; * etc/NEWS: Update entry about color fonts on OS X with a w...
b09ca27 Say why text-quoting-style is not a user option
This commit is contained in:
Paul Eggert 2016-05-01 18:07:57 -07:00
commit a8da4d033d
5 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/lispref/help.texi
View file

@ -362,6 +362,10 @@ this'} with grave accent and apostrophe, the standard style
before Emacs version 25. The default value @code{nil}
acts like @code{curve} if curved single quotes are displayable, and
like @code{grave} otherwise.
This variable can be used by experts on platforms that have problems
with curved quotes. As it is not intended for casual use, it is not a
user option.
@end defvar
@defun substitute-command-keys string

6
etc/NEWS
View file

@ -1913,7 +1913,8 @@ Set it to 'curve' for curved single quotes, to 'straight' for straight
apostrophes, and to 'grave' for grave accent and apostrophe. The
default value nil acts like 'curve' if curved single quotes are
displayable, and like 'grave' otherwise. The new variable affects
display of diagnostics and help, but not of info.
display of diagnostics and help, but not of info. As the variable is
not intended for casual use, it is not a user option.
+++
** substitute-command-keys now replaces quotes.
@ -2467,6 +2468,9 @@ emoji) display is disabled. This feature was accidentally added when
Emacs 24.4 included the new Core Text based font backend code that was
originally implemented for a non-mainline port. This will be enabled
again once it is also implemented in Emacs on free operating systems.
If some symbols, such as emoji, do not display, we suggest to install
an appropriate font, such as Symbola; then they will be displayed,
albeit without the color effects.
---
** The new function 'w32-application-type' returns the type of an

16
lisp/calendar/todo-mode.el
View file

@ -612,11 +612,12 @@ Otherwise, `todo-show' always visits `todo-default-todo-file'."
(defun todo-show (&optional solicit-file interactive)
"Visit a todo file and display one of its categories.
When invoked in Todo mode, prompt for which todo file to visit.
When invoked outside of Todo mode with non-nil prefix argument
SOLICIT-FILE prompt for which todo file to visit; otherwise visit
`todo-default-todo-file'. Subsequent invocations from outside
of Todo mode revisit this file or, with option
When invoked in Todo mode, Todo Archive mode or Todo Filtered
Items mode, or when invoked anywhere else with a prefix argument,
prompt for which todo file to visit. When invoked outside of a
Todo mode buffer without a prefix argument, visit
`todo-default-todo-file'. Subsequent invocations from outside of
Todo mode revisit this file or, with option
`todo-show-current-file' non-nil (the default), whichever todo
file was last visited.
@ -643,10 +644,7 @@ In Todo mode just the category's unfinished todo items are shown
by default. The done items are hidden, but typing
`\\[todo-toggle-view-done-items]' displays them below the todo
items. With non-nil user option `todo-show-with-done' both todo
and done items are always shown on visiting a category.
Invoking this command in Todo Archive mode visits the
corresponding todo file, displaying the corresponding category."
and done items are always shown on visiting a category."
(interactive "P\np")
(when todo-default-todo-file
(todo-check-file (todo-absolute-file-name todo-default-todo-file)))

8
lisp/rect.el
View file

@ -788,7 +788,7 @@ Ignores `line-move-visual'."
(if (not old)
(let ((ol (make-overlay left right)))
(overlay-put ol 'window window)
(overlay-put ol 'face 'rectangle-preview)
(overlay-put ol 'face 'region)
ol)
(let ((ol (pop old)))
(move-overlay ol left right (current-buffer))
@ -820,7 +820,7 @@ Ignores `line-move-visual'."
(overlay-put ol 'after-string nil)))
((< mright rightcol) ;`rightcol' is past EOL.
(let ((str (rectangle--space-to rightcol)))
(put-text-property 0 (length str) 'face 'rectangle-preview str)
(put-text-property 0 (length str) 'face 'region str)
;; If cursor happens to be here, draw it at the right place.
(rectangle--place-cursor leftcol left str)
(overlay-put ol 'after-string str)))
@ -832,7 +832,7 @@ Ignores `line-move-visual'."
(overlay-put ol 'after-string nil)
(goto-char right)
(let ((str (rectangle--space-to rightcol)))
(put-text-property 0 (length str) 'face 'rectangle-preview str)
(put-text-property 0 (length str) 'face 'region str)
(when (= left right)
(rectangle--place-cursor leftcol left str))
(overlay-put ol 'after-string str))))
@ -842,7 +842,7 @@ Ignores `line-move-visual'."
;; Make zero-width rectangles visible!
(overlay-put ol 'after-string
(concat (propertize " "
'face '(rectangle-preview (:height 0.2)))
'face '(region (:height 0.2)))
(overlay-get ol 'after-string))))
(push ol nrol)))
start end))

2
lisp/vc/vc-git.el
View file

@ -278,7 +278,7 @@ Should be consistent with the Git config value i18n.logOutputEncoding."
(defun vc-git-mode-line-string (file)
"Return a string for `vc-mode-line' to put in the mode line for FILE."
(let* ((rev (vc-working-revision file))
(let* ((rev (vc-working-revision file 'Git))
(disp-rev (or (vc-git--symbolic-ref file)
(substring rev 0 7)))
(def-ml (vc-default-mode-line-string 'Git file))