Paul Eggert [Mon, 2 May 2016 01:07:57 +0000 (18:07 -0700)]
Merge from origin/emacs-25
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
Paul Eggert [Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)]
Merge from origin/emacs-25
5a952eb Don't mention ~/.emacs.bmk literally in doc strings c338cf3 * etc/NEWS: Explain why multicolor font display is disabled o... c30d1b4 Port to Ubuntu 16.04 --enable-gcc-warnings
Lars Ingebrigtsen [Sun, 1 May 2016 16:38:07 +0000 (18:38 +0200)]
Allow finding libraries loaded manually outside the load-path
* lisp/emacs-lisp/find-func.el (find-library--from-load-path):
New function to find a library from a load path (bug#5661).
(find-library-name): Use it.
There are so many combinations of inputs and possibly entries in
`load-history' that the code looks like an entry in a code obfuscation
contest. If anybody has a better implementation, please substitute.
But remember that the input given may be foo, foo.el, foo.elc, and the
entries in load-history may be foo.el, foo.elc and foo.el.gz, and we
want to return only foo.el and foo.el.gz. *phew*
Lars Ingebrigtsen [Sun, 1 May 2016 14:53:38 +0000 (16:53 +0200)]
Allow minibuffer prompts to use faces
* doc/lispref/minibuf.texi (Text from Minibuffer): Document
`minibuffer-prompt-properties' and explain how faces work in
the minibuffer prompt.
* src/minibuf.c (read_minibuf): If `face' is in
`minibuffer-prompt-properties', apply it to the end of the
face list to allow users to have their own faces on the
prompts (bug#16136).
Peter Feigl [Sun, 1 May 2016 11:43:37 +0000 (13:43 +0200)]
Add R7RS syntax forms to scheme.el
* lisp/progmodes/scheme.el (scheme-font-lock-keywords-2): Add
a number of special forms introduced in R7RS-small.
* lisp/progmodes/scheme.el (scheme-indent-function): Same.
Alan Third [Sun, 1 May 2016 11:04:07 +0000 (13:04 +0200)]
Implement horizontal scroll bars on NS
* lisp/scroll-bar.el (horizontal-scroll-bars-available-p): Remove NS
check.
* lisp/term/ns-win.el: Remove custom NS scroll-bar handlers and bind
scroll-bar mouse clicks to standard handlers.
* src/nsterm.h (EmacsScroller): Add 'horizontal' property and rename
pixel_height to pixel_length.
* src/nsterm.m (x_set_window_size): Remove left-hand scroll-bar code. It
caused scroll-bars to be over-drawn and the best working solution
appears to be complete removal.
(ns_set_horizontal_scroll_bar): Rewrite to handle horizontal scrollers
correctly.
(ns_set_vertical_scroll_bar): Set width to actual scroller width.
(setFrame): Handle horizontal case.
(dealloc): Handle horizontal case.
(judge): Handle horizontal case.
(setPosition): Rename pixel_height to pixel_length.
(sendScrollEventAtLoc): Handle horizontal case.
(mouseDown): Handle horizontal case and general tidy up of code.
(mouseDragged): Handle horizontal case. Call sendScrollEventAtLoc with
absolute pixel size instead of ratio.
* src/window.h: Remove NS check.
Paul Eggert [Sun, 1 May 2016 00:50:17 +0000 (17:50 -0700)]
Fix the buffer-count patch (Bug#23394)
* src/buffer.c (Fgenerate_new_buffer_name): Increment count just
once each time through the loop. Reported by Lars Ingebrigtsen in:
http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00918.html
Paul Eggert [Sat, 30 Apr 2016 23:36:36 +0000 (16:36 -0700)]
Fix generate-new-buffer-name increment typo
Problem reported by Chaitanya Koparkar (Bug#23394).
* src/buffer.c (Fgenerate_new_buffer_name): Increment count when
generating a new buffer. This fixes a typo I introduced in
2014-04-05T00:04:58Z!eggert@cs.ucla.edu.
Lars Ingebrigtsen [Sat, 30 Apr 2016 21:52:19 +0000 (23:52 +0200)]
Describe WHEN in all the define-obsolete- macros
* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias):
Say more verbosely what WHEN is (bug#21225).
(define-obsolete-function-alias): Describe the WHEN parameter.
(define-obsolete-variable-alias): Ditto.
Lars Ingebrigtsen [Sat, 30 Apr 2016 20:42:46 +0000 (22:42 +0200)]
Add a cross ref to Optional Mode Line
* doc/lispref/modes.texi (Mode Line Variables): Add a cross
reference to the Emacs mode line node that explains things
like `display-time-string' (bug#21002).
Alan Mackenzie [Sat, 30 Apr 2016 16:37:41 +0000 (16:37 +0000)]
CC Mode: Recognize a noise macro with parens after a declarator's identifier
* lisp/progmodes/cc-engine (c-forward-decl-or-cast-1): In the while loop
following comment "Skip over type decl suffix operators." insert code also
to check for noise macros with parentheses.
Lars Ingebrigtsen [Sat, 30 Apr 2016 14:48:50 +0000 (16:48 +0200)]
Explictly explain that package-initialize loads the packages
* lisp/emacs-lisp/package.el (package-initialize): Be explicit
in saying that `package-initialize' obviates adjusting the
path or requiring the packages, as this is a question that
apparently comes up now and then (bug#18829).
Lars Ingebrigtsen [Sat, 30 Apr 2016 14:21:54 +0000 (16:21 +0200)]
Move doc of backup-directory-alist to the Backup node
* doc/emacs/files.texi (Backup): Move the documentation of
`backup-directory-alist' here from the "Single or Numbered
Backups" node, because it doesn't seem to have much to do with
numbering (bug#18692).
Lars Ingebrigtsen [Fri, 29 Apr 2016 00:40:13 +0000 (02:40 +0200)]
Remove uses of the unused to-end parameter from simple.el
* lisp/simple.el (line-move-partial): Remove usages of the
unused to-end parameter, and make it optional (bug#14844).
(line-move): Remove use of the unused to-end parameter.
Lars Ingebrigtsen [Thu, 28 Apr 2016 23:41:34 +0000 (01:41 +0200)]
Doc fix: _ chars are automatically removed.
* lisp/cus-edit.el (custom-buffer-create): _ chars are
automatically removed when displaying help, so fix the last
doc change.
(custom-buffer-create-other-window): Ditto.