Paul Eggert [Mon, 2 May 2016 01:14:23 +0000 (18:14 -0700)]
; Merge from origin/emacs-25
The following commits were skipped:
8aa4147 tramp.texi: Revert last change due to backward compatibility 69f7940 cua-prefix-override-inhibit-delay doc fix 350792e global-eldoc-mode doc fix c3b3b90 normal-top-level-add-subdirs-to-load-path doc fix 9f27bcf isearch-search-fun-function doc tweak 78ae805 Fill some imenu--index-alist doc lines d1ab001 Fmarker_position doc string clarification 8c66ebf Further define-obsolete-* doc fixups 25b4cf3 Describe WHEN in all the define-obsolete- macros 6b39501 Mention with-silent-modifications in the lispref manual 9722ae1 with-silent-modifications doc clarification 3bc26a7 clear-visited-file-modtime doc string fix 7b7b4c2 Document mode mode line variables 7907b82 Add a cross ref to Optional Mode Line ecdb340 Add a doc string to display-time-string 6d8c2d0 custom-buffer-style doc fix ef32be6 Rearrange the doc of query-replace slightly 7350d3d apropos-print doc fix afb2257 completion-table-with-predicate doc string fix f3f4502 Fill the completion-table-with-predicate doc string 983ad8d replace-match-maybe-edit doc clarification bbda22c add-timeout doc fix 818fb69 Extremely minor doc fix in Choosing Window 2abc85e Transform mentions of `eval-after-load' to `with-eval-after-l... ec392ff cursor-type doc fix ff834ff Add a link from Tool Bar to Images 93598ff (default-mode-line-format): More explicit obsolete info b04fcc4 Fcompare_buffer_substrings doc string clarification f92d0aa insert-file-contents-literally doc fix ad5572b Fix custom types for cursor-in-non-selected-windows 2ef780f Doc clarification to mwheel-scroll ed8474e Clarify the doc of eval-expression-print-format 8f1e784 Explictly explain that package-initialize loads the packages 1378680 Have the doc strings of `load-path' and `require' mention eac... a73de71 Doc fix for insert-pair-alist 619f1ed Move doc of backup-directory-alist to the Backup node 0846f21 Tiny doc clarification for create-fontset-from-fontset-spec 925af7e Fill the doc string of font-lock-keywords 05194cb Doc fix for font-lock-remove-keywords 7a03d55 Clarify whitespace-style doc string 651182d Doc fixed for next-error-buffer-p d815ba5 Tiny doc fix 7b85885 Doc fix c355774 delsel doc touch ups 4a2f33d Doc fixes for menu-bar.el 71795d4 Doc fix 3852fd6 Minor doc clarification db20f89 Fill font-lock-mode doc string df6cee9 Wrap the auto-generated doc string dc960d9 Clarify hi-lock-find-patterns 8748c21 Add a doc string to `winner-mode' 02c1aa8 Doc fix for align-newline-and-indent bc6c294 Doc fix for `kbd' 28ef870 Doc tweak 92559c7 Link from (emacs)Exiting to (lisp)Killing Emacs cc00738 find-lisp doc touchups 396747d Don't have the manual claim that it lists all CL incompatibil... 3cbc1e3 Change all occurrences of "Mouse-[0-9]" to "mouse-[0-9]" de8349e Doc string change to enable-recursive-minibuffers cf33ae0 Clarify the `interactive' doc string slightly 0a14d84 Clarify some doc strings 351c079 Add some concept index entries for custom types 3fc1ed8 Mention `lisp-indent-function' in the lispref manual 9bd2af8 Clarify doc string of internal compilation function
Paul Eggert [Mon, 2 May 2016 01:14:22 +0000 (18:14 -0700)]
Merge from origin/emacs-25
d8affa3 Use ‘T *restrict’ proto, not ‘T[restrict]’ d38d2a8 Fix documentation of 'url-retrieve-synchronously' 586b213 * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bu...
Paul Eggert [Mon, 2 May 2016 01:09:29 +0000 (18:09 -0700)]
Merge from origin/emacs-25
16e5e8e Fix last change to isearch-update (bug#23406) b755d98 Autoload cursor-sensor-inhibit (bug#23406) b52ebd4 org-map-entries: Fix org-agenda-prepare-buffers call 86aa409 Followup for last commit in the user manual 7004459 Improve doc string of 'set-goal-column' ccdaf04 Fix the MSDOS build ffe701c Remove \= from format string (bug#18190) 1c58fa1 Fix variable-pitch font on MS-Windows c6077bf Restore follow-scroll-up/down to scrolling by the combined si... b671e21 Revert unneeded change which harms syntactic parsing. This f... 48b24c9 Correct indentation of ids in a C++ enum after a protection k... 5c3534f * lisp/window.el (window--process-window-list): No-op if no p... 734fb3a Port dumping to NetBSD with PaX 0255a70 Don't mistake `for' inside a function for a part of array com...
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
* 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.
* 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).
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).
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).
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*
Paul Eggert [Sun, 1 May 2016 16:00:08 +0000 (09:00 -0700)]
Use ‘T *restrict’ proto, not ‘T[restrict]’
* src/fns.c (sort_vector_copy): Use a different way to attempt to
work around GCC 3.0-and-earlier incompatibility with C99, one that
does not have problems with modern non-GCC compilers.
* 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.
projects / emacs.git / log