]> git.eshelyaron.com Git - emacs.git/log
emacs.git
7 years agoDon't hard-code gitmerge.el's default merge branch
Glenn Morris [Sat, 2 Dec 2017 03:03:05 +0000 (22:03 -0500)]
Don't hard-code gitmerge.el's default merge branch

* admin/gitmerge.el (gitmerge-default-branch): Make it a variable,
defaulting to nil.
(gitmerge-emacs-version, gitmerge-default-branch): New functions.
(gitmerge): Guess the branch to merge from.

7 years ago* admin/gitmerge.el (gitmerge-resolve):
Glenn Morris [Sat, 2 Dec 2017 03:00:02 +0000 (22:00 -0500)]
* admin/gitmerge.el (gitmerge-resolve):
Fix treatment of generated files.

7 years ago; * doc/lispref/eval.texi (Deferred Eval): Improve wording.
Eli Zaretskii [Fri, 1 Dec 2017 18:26:35 +0000 (20:26 +0200)]
; * doc/lispref/eval.texi (Deferred Eval): Improve wording.

7 years ago; Auto-commit of loaddefs files.
Glenn Morris [Fri, 1 Dec 2017 12:26:59 +0000 (07:26 -0500)]
; Auto-commit of loaddefs files.

7 years agoAdd macros `thunk-let' and `thunk-let*'
Michael Heerdegen [Thu, 2 Nov 2017 17:45:34 +0000 (18:45 +0100)]
Add macros `thunk-let' and `thunk-let*'

* lisp/emacs-lisp/thunk.el (thunk-let, thunk-let*): New macros.
* test/lisp/emacs-lisp/thunk-tests.el:
(thunk-let-basic-test, thunk-let*-basic-test)
(thunk-let-bound-vars-cant-be-set-test)
(thunk-let-laziness-test, thunk-let*-laziness-test)
(thunk-let-bad-binding-test): New tests for `thunk-let' and
`thunk-let*.

* doc/lispref/eval.texi (Deferred Eval): New section.
* doc/lispref/elisp.texi: Update menu.

7 years agoAdd date to dependency and source zips for snapshots
Phillip Lord [Wed, 29 Nov 2017 21:28:44 +0000 (21:28 +0000)]
Add date to dependency and source zips for snapshots

* admin/nt/dist-build/build-zips.sh,
  admin/nt/dist-build/build-dep-zips.py: Support snapshot naming

7 years agoMake truncate-lines permanently local (bug#15396)
Glenn Morris [Thu, 30 Nov 2017 17:40:46 +0000 (12:40 -0500)]
Make truncate-lines permanently local (bug#15396)

Width of lines relative to display is rarely a function of major mode.
* src/buffer.c (init_buffer_once) <truncate-lines>:
Flag as permanently local.
* lisp/bindings.el (truncate-lines): Add permanent-local property.

7 years agoMerge from origin/emacs-26
Glenn Morris [Thu, 30 Nov 2017 01:12:56 +0000 (17:12 -0800)]
Merge from origin/emacs-26

408862f02a (origin/emacs-26) ; * lisp/emacs-lisp/bytecomp.el: Tweak m...
9964db4c34 Restore obsolete method of changing byte-compile-dest-file
3dd25aeecb Some minor Tramp corrections
d670a15f25 * doc/misc/url.texi (http/https): Fix typo
99d07e8d5e Remove some bogus definition-prefixes from loaddefs
6067f0c702 Shell-quote wildcards when invoking 'vc-git-grep'
0540df10e6 Update documentation of '.dir-locals-2.el'
f2441ab320 ; Fix some tiny doc and comment typos
22ff46e6d8 ; Fix some comment typos

# Conflicts:
# etc/NEWS

7 years ago; Merge from origin/emacs-26
Glenn Morris [Thu, 30 Nov 2017 01:12:06 +0000 (17:12 -0800)]
; Merge from origin/emacs-26

The following commit was skipped:

340f74daa8 * src/w32heap.c (DUMPED_HEAP_SIZE) [_WIN64]: Bump to 22 MiB.

7 years agoMerge from origin/emacs-26
Glenn Morris [Thu, 30 Nov 2017 01:12:06 +0000 (17:12 -0800)]
Merge from origin/emacs-26

f2e6961a1b ; * lisp/emacs-lisp/bytecomp.el (byte-compile-dest-file): ...
1c8bd8a119 A few small doc fixes for bytecomp.el

7 years ago; Merge from origin/emacs-26
Glenn Morris [Thu, 30 Nov 2017 01:12:06 +0000 (17:12 -0800)]
; Merge from origin/emacs-26

The following commit was skipped:

37f3a6b216 * src/lread.c (syms_of_lread): Fix thinko in commit b1573a...

7 years agoMerge from origin/emacs-26
Glenn Morris [Thu, 30 Nov 2017 01:12:05 +0000 (17:12 -0800)]
Merge from origin/emacs-26

02d114d6b8 * lisp/tree-widget.el (tree-widget-end-guide): Escape it. ...
0a85d12474 Fix ELisp "Warning Tips"
06d05fec84 Fix Bug#29163
ac64fdb248 Harden exec_byte_code against redefining 'error'
700f74e4c8 Fix Edebug specs for if-let* and and-let* (Bug#29236)
0ded1b41a9 Fix Edebug's handling of dotted specs (bug#6415)
16358d4fcb Improve documentation of "constant" symbols

7 years ago* lisp/gnus/message.el: Use pcase and cl-lib
Stefan Monnier [Wed, 29 Nov 2017 22:38:46 +0000 (17:38 -0500)]
* lisp/gnus/message.el: Use pcase and cl-lib

(message-check-news-body-syntax): Avoid string-to-multibyte.

7 years ago; * lisp/emacs-lisp/bytecomp.el: Tweak message formatting in previous.
Glenn Morris [Wed, 29 Nov 2017 20:27:06 +0000 (15:27 -0500)]
; * lisp/emacs-lisp/bytecomp.el: Tweak message formatting in previous.

7 years agoRestore obsolete method of changing byte-compile-dest-file
Glenn Morris [Wed, 29 Nov 2017 20:11:01 +0000 (15:11 -0500)]
Restore obsolete method of changing byte-compile-dest-file

* lisp/emacs-lisp/bytecomp.el (byte-compile-dest-file):
Restore seven-year obsolete feature that was removed for six months,
since automake uses it.

7 years agoSome minor Tramp corrections
Michael Albinus [Wed, 29 Nov 2017 08:37:42 +0000 (09:37 +0100)]
Some minor Tramp corrections

* lisp/net/tramp.el (tramp-handle-directory-file-name):
Handle several trailing slashes correctly.
(tramp-handle-file-selinux-context): New defun.

* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Use `tramp-handle-file-selinux-context'.

* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Extend test.
(tramp-test17-insert-directory): Make check more robust.
(tramp-test42-auto-load): Combine several let forms.
(tramp-test42-delay-load, tramp-test42-recursive-load)
(tramp-test42-remote-load-path, tramp-test43-unload): Rename.

7 years ago* doc/misc/url.texi (http/https): Fix typo
Tino Calancha [Wed, 29 Nov 2017 02:42:11 +0000 (11:42 +0900)]
* doc/misc/url.texi (http/https): Fix typo

7 years agoPut most erc autoloads in a dedicated file erc-loaddefs.el
Glenn Morris [Wed, 29 Nov 2017 02:16:02 +0000 (21:16 -0500)]
Put most erc autoloads in a dedicated file erc-loaddefs.el

These are features that are only useful after erc.el is loaded.
* lisp/erc/erc.el (top-level): Load erc-loaddefs.
* lisp/erc/erc-autoaway.el, lisp/erc/erc-button.el:
* lisp/erc/erc-capab.el, lisp/erc/erc-compat.el:
* lisp/erc/erc-dcc.el, lisp/erc/erc-desktop-notifications.el:
* lisp/erc/erc-ezbounce.el, lisp/erc/erc-fill.el:
* lisp/erc/erc-identd.el, lisp/erc/erc-imenu.el:
* lisp/erc/erc-join.el, lisp/erc/erc-list.el, lisp/erc/erc-log.el:
* lisp/erc/erc-match.el, lisp/erc/erc-menu.el:
* lisp/erc/erc-netsplit.el, lisp/erc/erc-notify.el:
* lisp/erc/erc-page.el, lisp/erc/erc-pcomplete.el:
* lisp/erc/erc-replace.el, lisp/erc/erc-ring.el:
* lisp/erc/erc-services.el, lisp/erc/erc-sound.el:
* lisp/erc/erc-speedbar.el, lisp/erc/erc-spelling.el:
* lisp/erc/erc-stamp.el, lisp/erc/erc-track.el:
* lisp/erc/erc-truncate.el, lisp/erc/erc-xdcc.el:
Set generated-autoload-file to "erc-loaddefs.el".

7 years agoRemove some bogus definition-prefixes from loaddefs
Glenn Morris [Wed, 29 Nov 2017 00:58:32 +0000 (19:58 -0500)]
Remove some bogus definition-prefixes from loaddefs

* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads):
Don't register a definition prefix from define-erc-module,
which adds an erc- prefix to its argument.

7 years agoShell-quote wildcards when invoking 'vc-git-grep'
Robert Pluim [Tue, 28 Nov 2017 17:46:38 +0000 (19:46 +0200)]
Shell-quote wildcards when invoking 'vc-git-grep'

* lisp/vc/vc-git.el (vc-git-grep): Apply shell quoting to
filename wildcards to ensure globbing is done by git rather
than the shell.  (Bug#29303)

7 years agoUpdate documentation of '.dir-locals-2.el'
Kaushal Modi [Tue, 28 Nov 2017 17:17:48 +0000 (19:17 +0200)]
Update documentation of '.dir-locals-2.el'

See https://lists.gnu.org/r/emacs-devel/2017-11/msg00649.html
for more details.
* lisp/files.el (dir-locals-file-2): Remove unused constant.
* lisp/files.el (dir-locals-file): Mention ".dir-locals-2.el" in
the doc string.
* doc/lispref/variables.texi (Directory Local Variables): Mention
".dir-locals-2.el".
* etc/NEWS: Replace `dir-locals-file-2' mention with
`dir-locals-file'.

7 years ago; Fix some tiny doc and comment typos
Glenn Morris [Tue, 28 Nov 2017 16:50:05 +0000 (08:50 -0800)]
; Fix some tiny doc and comment typos

7 years ago; Fix some comment typos
Glenn Morris [Tue, 28 Nov 2017 00:28:28 +0000 (19:28 -0500)]
; Fix some comment typos

7 years agoFix probable typo in elisp-mode constant name
Glenn Morris [Mon, 27 Nov 2017 22:55:53 +0000 (17:55 -0500)]
Fix probable typo in elisp-mode constant name

* lisp/progmodes/elisp-mode.el (emacs-lisp-byte-code-comment-re):
Rename from emacs-list-byte-code-comment-re.  Add doc string.
(elisp--byte-code-comment, elisp-byte-code-syntax-propertize):
Update for the above.

7 years agoUpdate Build files for Emacs-27
Phillip Lord [Mon, 27 Nov 2017 22:13:41 +0000 (22:13 +0000)]
Update Build files for Emacs-27

* admin/nt/dist-build/README-windows-binaries,
  admin/nt/dist-build/build-dep-zips.py,
  admin/nt/dist-build/build-zips.sh: Update Version

7 years ago* src/w32heap.c (DUMPED_HEAP_SIZE) [_WIN64]: Bump to 22 MiB.
Noam Postavsky [Tue, 21 Nov 2017 19:12:55 +0000 (14:12 -0500)]
* src/w32heap.c (DUMPED_HEAP_SIZE) [_WIN64]: Bump to 22 MiB.

7 years ago* lisp/emacs-lisp/cl-macs.el: Fix bug#26073.
Stefan Monnier [Mon, 27 Nov 2017 20:33:30 +0000 (15:33 -0500)]
* lisp/emacs-lisp/cl-macs.el: Fix bug#26073.

* lisp/emacs-lisp/cl-macs.el (cl--sm-macroexpand):
Implement Common-Lisp's behavior for symbol-macro's let-rebindings.
(cl--letf, cl-letf): Don't get fooled into using a plain `let` for
symbol-macros.

* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-symbol-macrolet-hide):
New test.

7 years ago; * lisp/emacs-lisp/bytecomp.el (byte-compile-dest-file):
Glenn Morris [Mon, 27 Nov 2017 19:25:35 +0000 (14:25 -0500)]
; * lisp/emacs-lisp/bytecomp.el (byte-compile-dest-file):
Fix typo in previous.

7 years agoA few small doc fixes for bytecomp.el
Glenn Morris [Mon, 27 Nov 2017 19:10:34 +0000 (14:10 -0500)]
A few small doc fixes for bytecomp.el

* lisp/emacs-lisp/bytecomp.el (emacs-lisp-file-regexp)
(byte-compile-dest-file-function, byte-compile-dest-file): Doc fixes.

7 years ago* src/lread.c (syms_of_lread): Fix thinko in commit b1573a97e17b5
Stefan Monnier [Mon, 27 Nov 2017 18:53:23 +0000 (13:53 -0500)]
* src/lread.c (syms_of_lread): Fix thinko in commit b1573a97e17b5

7 years ago* lisp/tree-widget.el (tree-widget-end-guide): Escape it. (Bug#27797)
Glenn Morris [Mon, 27 Nov 2017 18:52:07 +0000 (13:52 -0500)]
* lisp/tree-widget.el (tree-widget-end-guide): Escape it.  (Bug#27797)

7 years ago* lisp/emacs-lisp/cl-macs.el: Fix &key with no key arg
Stefan Monnier [Mon, 27 Nov 2017 17:45:16 +0000 (12:45 -0500)]
* lisp/emacs-lisp/cl-macs.el: Fix &key with no key arg

* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-empty-keyargs): New test.
* lisp/emacs-lisp/cl-macs.el (cl--do-arglist): Fix it.

7 years ago* src/lread.c (syms_of_lread): Fix thinko in commit b1573a97e17b5.
Stefan Monnier [Mon, 27 Nov 2017 17:43:18 +0000 (12:43 -0500)]
* src/lread.c (syms_of_lread): Fix thinko in commit b1573a97e17b5.

7 years agoFix ELisp "Warning Tips"
Eli Zaretskii [Mon, 27 Nov 2017 16:24:29 +0000 (18:24 +0200)]
Fix ELisp "Warning Tips"

* doc/lispref/tips.texi (Warning Tips): Clarify when to use
'require' wrapped by 'eval-when-compile'.  (Bug#29462)

7 years agoFix Bug#29163
Michael Albinus [Mon, 27 Nov 2017 12:31:53 +0000 (13:31 +0100)]
Fix Bug#29163

* lisp/net/tramp.el (tramp-autoload-file-name-regexp):
Do not use "\\'" in regexp.  (Bug#29163)
(top) Do not run (tramp-register-autoload-file-name-handlers)
when loading tramp.el.

* test/lisp/net/tramp-tests.el (tramp--test-mock-p): New defun.
(tramp-test32-environment-variables-and-port-numbers)
(tramp-test41-asynchronous-requests): Use it.
(tramp-test42-auto-load): New test.
(tramp-test43-recursive-load, tramp-test44-remote-load-path)
(tramp-test45-delay-load, tramp-test46-unload): Rename.

7 years agoPacify --enable-gcc-warnings on Ubuntu 17.10 x86-64
Paul Eggert [Mon, 27 Nov 2017 04:13:16 +0000 (20:13 -0800)]
Pacify --enable-gcc-warnings on Ubuntu 17.10 x86-64

* src/process.c (Fmake_network_process):
Avoid duplicate test of NILP (host), which apparently confuses
GCC into thinking that portstringlen might be used uninitialized.

7 years agoHarden exec_byte_code against redefining 'error'
Paul Eggert [Mon, 27 Nov 2017 03:15:14 +0000 (19:15 -0800)]
Harden exec_byte_code against redefining 'error'

Problem discovered by configuring with --enable-gcc-warnings on
Ubuntu 17.10 x86-64 with gcc (Ubuntu 7.2.0-8ubuntu3).
* src/bytecode.c (exec_byte_code): Call the C error function
instead of the Lisp one, so that the Emacs interpreter does not go
haywire if the user redefines the Lisp error function.

7 years agoFix Edebug specs for if-let* and and-let* (Bug#29236)
Gemini Lasswell [Mon, 6 Nov 2017 05:36:58 +0000 (21:36 -0800)]
Fix Edebug specs for if-let* and and-let* (Bug#29236)

* test/lisp/emacs-lisp/subr-x.el (if-let*, if-let): Change Edebug
spec to cause Edebug to instrument tests the results of which are
not bound to symbols (the (VALUEFORM) case).
(and-let*): Change Edebug spec to allow empty body.

*test/lisp/emacs-lisp/subr-x-tests.el:
(subr-x-and-let*-test-group-1): Add missing quote to erroneous
form so Edebug will work on this test.

7 years agoFix Edebug's handling of dotted specs (bug#6415)
Gemini Lasswell [Thu, 2 Nov 2017 04:13:02 +0000 (21:13 -0700)]
Fix Edebug's handling of dotted specs (bug#6415)

* lisp/emacs-lisp/cl-macs.el (cl-destructuring-bind): Use
cl-macro-list1 instead of cl-macro-list in Edebug spec.

* lisp/emacs-lisp/edebug.el (edebug-after-dotted-spec): Delete
unused variable.
(edebug-dotted-spec): Add docstring.
(edebug-match-specs): Allow &optional and &rest specs to
match nothing at the tail of a dotted form. Handle matches of
dotted form tails which return non-lists.

* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-dotted-forms):
New test.

* test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el:
(edebug-test-code-use-destructuring-bind): New function.

7 years ago* src/process.c (wait_reading_process_output): Deduplicate check.
Charles A. Roelli [Sun, 26 Nov 2017 19:18:54 +0000 (20:18 +0100)]
* src/process.c (wait_reading_process_output): Deduplicate check.

(Bug#29454)

7 years agoImprove documentation of "constant" symbols
Eli Zaretskii [Sun, 26 Nov 2017 18:23:15 +0000 (20:23 +0200)]
Improve documentation of "constant" symbols

* src/font.c (syms_of_font) <font-weight-table, font-slant-table>
<font-width-table>:
* src/data.c (syms_of_data) <most-positive-fixnum>
<most-negative-fixnum>:
* src/buffer.c (syms_of_buffer) <enable-multibyte-characters>:
Mention in the doc strings that these variables are read-only.

* doc/lispref/variables.texi (Creating Buffer-Local): Document
that making a constant variable buffer-local signals an error.
* doc/lispref/variables.texi (Constant Variables):
* doc/lispref/errors.texi (Standard Errors): More accurate and
up-to-date documentation of which symbols cannot be assigned
values.

7 years agoMerge from origin/emacs-26
Paul Eggert [Sun, 26 Nov 2017 06:55:35 +0000 (22:55 -0800)]
Merge from origin/emacs-26

a89f0b6f33 maint: shorten https://lists.gnu.org/archive/html/... links
8be3aee281 Merge from Gnulib
265cee553f Work around GCC bug 80776 on Fedora 27 x86
dc7a97fb84 Tweak copy-file, rename-file doc
cfa2a944d4 Change font-lock-extend-region-multiline handling in mhtml...
a8664cc998 Minor cleanup in tramp-gvfs-handle-file-local-copy
55c5b12fa0 Add test for Bug#29423 in Tramp.
3198a1646e Avoid jumbled order in HTML rendered by shr.el
23bfc2d2db Make sure 'dired-filename' property is always put by ls-lisp
f7fdaea4c0 A better solution for bug#29347
86e6ed8521 ; * src/thread.c (acquire_global_lock): Fix thinko in last...
f300852037 Avoid a hang after C-g while sit-for on a Unix TTY
d7fc719ff1 Improve the doc string of 'list-packages'
b4f67ebb92 Improve discoverability of 'defvar' for suppressing warnings
8a2b204e64 Improve discoverability of 'read-buffer-completion-ignore-...
eea4e9194c Improve documentation of self-insert-uses-region-functions
e6e41dac87 Reflect changes in copy-file and rename-file in doc strings
0ec534070f * lisp/progmodes/cc-vars.el (c-offsets-alist): Doc fix.  (...
1d0dbdff6c Reorder type predicates in ELisp manual
b081ec9dd7 Fix backward scrolling in buffers with header-line
8e40429c96 ; Fix some doc typos
ed2c542920 * lisp/bindings.el (buffer-file-coding-system): Add explic...
d82474e452 * src/fns.c (syms_of_fns) <overriding-plist-environment>: ...
292c09ff6d Fix incorrect interaction of drag/drop and double click (b...
d6fadb1d26 * lisp/menu-bar.el (menu-bar-options-save): Add display-li...
daa959efbc * lisp/menu-bar.el (menu-bar-options-save): Add global-dis...
17fc74d1b9 * lisp/follow.el (follow-mode): Restore mode line lighter....
f20c2e2f3d ; Compare process status against 127 exactly
2d203ffb7e Extract the common part of ruby-flymake-simple and ruby-fl...
09944d499a Add Rubocop Flymake backend
c65a0ae7c4 ; Fix a typo
7ab7603125 Update nt/INSTALL.W64 (Bug#28601)
11db253c08 Remove incorrect NEWS item about VC state indicator (Bug#2...
2fdc01c036 * lisp/emacs-lisp/byte-run.el (defsubst): Doc fix.
735c8b516e Make c-defun-name analyze more thoroughly a function type ...
92f0c4cd56 Avoid bogus abbreviated file names if HOME changes
8d450453fa * lisp/emacs-lisp/byte-run.el (inline): Give it a doc.
37a3b4ea40 Fix erc keep-place module with new defaults (Bug#29111)
6c312605bf Add window divider faces to NS (bug#29353)

# Conflicts:
# etc/NEWS
# lisp/ruler-mode.el

7 years agomaint: shorten https://lists.gnu.org/archive/html/... links
Paul Eggert [Sun, 26 Nov 2017 06:45:41 +0000 (22:45 -0800)]
maint: shorten https://lists.gnu.org/archive/html/... links

7 years agoMerge from Gnulib
Paul Eggert [Sun, 26 Nov 2017 06:28:31 +0000 (22:28 -0800)]
Merge from Gnulib

This incorporates:
2017-11-23 stat: work around Solaris bug with tv_nsec < 0
2017-11-12 maint: shorten https://lists.gnu.org/archive/html/... links
* build-aux/config.sub, doc/misc/texinfo.tex, lib/allocator.h:
* lib/fstatat.c, lib/intprops.h, lib/lstat.c, lib/signal.in.h:
* lib/stat-time.h, lib/stdio-impl.h, lib/stdio.in.h:
* lib/timespec.h, m4/alloca.m4, m4/extern-inline.m4:
* m4/faccessat.m4, m4/fstatat.m4, m4/gnulib-common.m4:
* m4/lstat.m4, m4/std-gnu11.m4, m4/sys_types_h.m4:
* m4/vararrays.m4:
Copy from Gnulib.

7 years agoWork around GCC bug 80776 on Fedora 27 x86
Paul Eggert [Sun, 26 Nov 2017 00:11:43 +0000 (16:11 -0800)]
Work around GCC bug 80776 on Fedora 27 x86

* src/buffer.c (Fgenerate_new_buffer_name): Pacify GCC 7.2.1
20170915 (Red Hat 7.2.1-2) on i686 with -Wformat-overflow -O2 by
using XINT rather than XFASTINT and by adding an eassume.  This
works around GCC bug 80776.

7 years agoTweak copy-file, rename-file doc
Paul Eggert [Sat, 25 Nov 2017 21:04:30 +0000 (13:04 -0800)]
Tweak copy-file, rename-file doc

* src/fileio.c (Fcopy_file, Frename_file): Tweak the recent change
slightly, as NEWNAME is treated as a directory name depending only
on the contents of the NEWNAME string, and independently of
whether NEWNAME names a directory (i.e., whether the directory
exists) (Bug#29362).

7 years agoChange font-lock-extend-region-multiline handling in mhtml-mode
Tom Tromey [Sat, 25 Nov 2017 19:11:21 +0000 (12:11 -0700)]
Change font-lock-extend-region-multiline handling in mhtml-mode

Bug#29159
* lisp/textmodes/mhtml-mode.el (mhtml-mode): Remove
font-lock-extend-region-multiline from
font-lock-extend-region-functions.
(mhtml--extend-font-lock-region): Call font-lock-extend-region-multiline.

7 years agoMinor cleanup in tramp-gvfs-handle-file-local-copy
Michael Albinus [Sat, 25 Nov 2017 15:09:55 +0000 (16:09 +0100)]
Minor cleanup in tramp-gvfs-handle-file-local-copy

* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-local-copy):
Move error message up.

7 years agoAdd test for Bug#29423 in Tramp.
Michael Albinus [Sat, 25 Nov 2017 15:03:53 +0000 (16:03 +0100)]
Add test for Bug#29423 in Tramp.

* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory):
Add test for Bug#29423.

7 years agoAvoid jumbled order in HTML rendered by shr.el
Eli Zaretskii [Sat, 25 Nov 2017 11:31:51 +0000 (13:31 +0200)]
Avoid jumbled order in HTML rendered by shr.el

* lisp/net/shr.el (shr-render-td): Preserve point, as
shr-render-td-1 might move it as a side effect of
save-window-excursion.  (Bug#29348)

7 years agoMake sure 'dired-filename' property is always put by ls-lisp
Eli Zaretskii [Sat, 25 Nov 2017 10:35:09 +0000 (12:35 +0200)]
Make sure 'dired-filename' property is always put by ls-lisp

* lisp/ls-lisp.el (ls-lisp-classify): Do not put the
'dired-filename' text property on the file name here...
(ls-lisp-classify-file): ...put it here instead.  (Bug#29423)

7 years agoObsolete gnus-copy-sequence and gnus-last-element
Eric Abrahamsen [Tue, 9 May 2017 11:17:29 +0000 (19:17 +0800)]
Obsolete gnus-copy-sequence and gnus-last-element

(Bug#28856, Bug#28867)

* lisp/gnus/gnus-range.el: Leave gnus-last-element in place, but
  obsolete it and point to car of last. Remove gnus-copy-sequence and
  define as an obsolete alias for copy-tree.
  (gnus-remove-from-range):
* lisp/gnus/gnus-cache.el (gnus-cache-generate-active):
* lisp/gnus/gnus-sum.el (gnus-summary-insert-articles,
  gnus-select-newsgroup, gnus-summary-read-group-1,
  gnus-select-newsgroup, gnus-update-marks,
  gnus-summary-insert-articles, gnus-summary-insert-new-articles):
  Replace calls in these locations.
* lisp/gnus/gnus-agent.el (gnus-agent-catchup,
  gnus-agent-summary-fetch-series, gnus-category-copy):
* lisp/gnus/gnus-cus.el (gnus-group-customize):
* lisp/gnus/gnus-group.el (gnus-group-edit-group-done,
  gnus-group-make-useful-group):
* lisp/gnus/gnus-score.el (gnus-score-adaptive):
* lisp/gnus/gnus-srvr.el (gnus-server-copy-server): Replace calls in
  these locations.

7 years agoA better solution for bug#29347
Eli Zaretskii [Fri, 24 Nov 2017 21:37:42 +0000 (23:37 +0200)]
A better solution for bug#29347

* src/thread.c (really_call_select): Don't try to take the global
lock if the same thread is already holding it.  (Bug#29347)

7 years ago* src/data.c: Fix regression in last clone-buffer change
Stefan Monnier [Fri, 24 Nov 2017 21:15:09 +0000 (16:15 -0500)]
* src/data.c: Fix regression in last clone-buffer change

* src/data.c (Fmake_local_variable, Fmake_variable_buffer_local):
Signal more precise error when applied to read-only variable.

7 years ago; * src/thread.c (acquire_global_lock): Fix thinko in last change.
Eli Zaretskii [Fri, 24 Nov 2017 21:11:55 +0000 (23:11 +0200)]
; * src/thread.c (acquire_global_lock): Fix thinko in last change.

7 years agoFix last patch: ensure the return value of tags-verify-table.
Sam Steingold [Fri, 24 Nov 2017 19:25:41 +0000 (14:25 -0500)]
Fix last patch: ensure the return value of tags-verify-table.

* lisp/progmodes/etags.el (tags-verify-table): Since `(tags-table-mode)'
always return nil now that it is a derived mode, call
`verify-tags-table-function' explicitly.

7 years agoUse NULL for NULL rather than false
Pip Cet [Fri, 24 Nov 2017 18:07:49 +0000 (10:07 -0800)]
Use NULL for NULL rather than false

* src/xdisp.c (x_draw_bottom_divider): Fix type typo.

7 years ago* lisp/macros.el (insert-kbd-macro): Recognize kmacros reliably
Stefan Monnier [Fri, 24 Nov 2017 16:32:14 +0000 (11:32 -0500)]
* lisp/macros.el (insert-kbd-macro): Recognize kmacros reliably

* lisp/macros.el (name-last-kbd-macro): Make it an alias of
kmacro-name-last-macro.
(insert-kbd-macro): Use kmacro-keyboard-macro-p so it also works for
kmacros that fail to have a `kmacro' property.
(see https://emacs.stackexchange.com/questions/37065, for an example).

* lisp/kmacro.el: Remove redundant :group args.
(kmacro-insert-counter): Simplify.
(kmacro-extract-lambda): Use car/cdr-safe.
(kmacro-p, kmacro-keyboard-macro-p): New functions.
(kmacro-name-last-macro): Use them.

7 years agoAvoid a hang after C-g while sit-for on a Unix TTY
Eli Zaretskii [Fri, 24 Nov 2017 16:13:57 +0000 (18:13 +0200)]
Avoid a hang after C-g while sit-for on a Unix TTY

* src/thread.c (acquire_global_lock): Don't try to take the global
lock if the same thread is already holding it.  (Bug#29347)

7 years agoRemove pinentry.el
Daiki Ueno [Fri, 24 Nov 2017 15:11:48 +0000 (16:11 +0100)]
Remove pinentry.el

* lisp/epg.el (epg--start): Remove the use of pinentry.el.
* lisp/net/pinentry.el: Remove (bug#27445).

7 years agoImprove the doc string of 'list-packages'
Eli Zaretskii [Fri, 24 Nov 2017 14:49:10 +0000 (16:49 +0200)]
Improve the doc string of 'list-packages'

* lisp/emacs-lisp/package.el (list-packages): Describe in the doc
string the columns shown by the command.  (Bug#29420)

7 years agoImprove discoverability of 'defvar' for suppressing warnings
Eli Zaretskii [Fri, 24 Nov 2017 14:36:33 +0000 (16:36 +0200)]
Improve discoverability of 'defvar' for suppressing warnings

* doc/lispref/compile.texi (Compiler Errors): Add index entries.
* doc/lispref/variables.texi (Defining Variables): Mention that
defvar with no value is used for suppressing compiler warnings.
(Bug#29400)

7 years agoImprove discoverability of 'read-buffer-completion-ignore-case'
Eli Zaretskii [Fri, 24 Nov 2017 13:58:00 +0000 (15:58 +0200)]
Improve discoverability of 'read-buffer-completion-ignore-case'

* lisp/window.el (switch-to-buffer)
(switch-to-buffer-other-window, switch-to-buffer-other-frame):
Mention 'read-buffer' in the doc string.  (Bug#29389)

* doc/emacs/buffers.texi (Select Buffer): Add a cross-reference to
where 'read-buffer-completion-ignore-case' is documented.

7 years agoImprove documentation of self-insert-uses-region-functions
Eli Zaretskii [Fri, 24 Nov 2017 10:49:04 +0000 (12:49 +0200)]
Improve documentation of self-insert-uses-region-functions

* lisp/simple.el (self-insert-uses-region-functions): Clarify the
doc string.
* lisp/delsel.el (delete-selection-uses-region-p): Mention
'self-insert-command' in the doc string.  (Bug#29373)

* doc/lispref/text.texi (Commands for Insertion): Mention
'self-insert-uses-region-functions'.
* doc/lispref/modes.texi (Keymaps and Minor Modes): Add a
cross-reference to "Commands for Insertion".

7 years agoAvoid unnecessary xwidget_view creations
Jaesup Kwak [Fri, 24 Nov 2017 09:33:32 +0000 (11:33 +0200)]
Avoid unnecessary xwidget_view creations

* src/xwidget.c (x_draw_xwidget_glyph_string): Don't create new
xwidget view if we have a usable one already.

Copyright-paperwork-exempt: yes

7 years agoMore informative error when autosave file is not available
Alex Branham [Fri, 24 Nov 2017 08:59:12 +0000 (10:59 +0200)]
More informative error when autosave file is not available

* lisp/files.el (recover-file): Distinguish in error messages
between autosave file not existing and not being current.
(Bug#29179)

7 years agoReflect changes in copy-file and rename-file in doc strings
Eli Zaretskii [Fri, 24 Nov 2017 08:49:29 +0000 (10:49 +0200)]
Reflect changes in copy-file and rename-file in doc strings

* src/fileio.c (Fcopy_file, Frename_file): Mention in the doc
strings that directory names must end in a slash.  (Bug#29362)

7 years ago* lisp/progmodes/cc-vars.el (c-offsets-alist): Doc fix. (Bug#29407)
Eli Zaretskii [Fri, 24 Nov 2017 08:41:49 +0000 (10:41 +0200)]
* lisp/progmodes/cc-vars.el (c-offsets-alist): Doc fix.  (Bug#29407)

7 years agoReorder type predicates in ELisp manual
Eli Zaretskii [Fri, 24 Nov 2017 08:07:40 +0000 (10:07 +0200)]
Reorder type predicates in ELisp manual

* doc/lispref/objects.texi (Type Predicates): Restore alphabetical
order of listed predicates.  (Bug#29411)

7 years agoFix backward scrolling in buffers with header-line
Eli Zaretskii [Thu, 23 Nov 2017 20:29:59 +0000 (22:29 +0200)]
Fix backward scrolling in buffers with header-line

* src/window.c (window_scroll_pixel_based): Account for the
header-line when comparing Y coordinate with the last_visible_y.
(Bug#29325)

7 years ago* lisp/simple.el (clone-buffer): Adjust `mark-ring'
Stefan Monnier [Thu, 23 Nov 2017 18:35:15 +0000 (13:35 -0500)]
* lisp/simple.el (clone-buffer): Adjust `mark-ring'

7 years ago; Fix some doc typos
Glenn Morris [Wed, 22 Nov 2017 22:52:11 +0000 (17:52 -0500)]
; Fix some doc typos

7 years agoMarked groups should always be visible in *Group* buffer
Eric Abrahamsen [Mon, 15 May 2017 09:26:16 +0000 (17:26 +0800)]
Marked groups should always be visible in *Group* buffer

* lisp/gnus/gnus-group.el (gnus-group-prepare-flat): Check for the
  mark in these two locations.
* lisp/gnus/gnus-topic.el (gnus-topic-find-groups)

7 years ago* lisp/bindings.el (buffer-file-coding-system):
Glenn Morris [Wed, 22 Nov 2017 21:36:07 +0000 (16:36 -0500)]
* lisp/bindings.el (buffer-file-coding-system):
Add explicit permanent-local mark.

; * src/buffer.c (init_buffer_once): Comment.

7 years agoUse special-mode for read-only buffers.
Sam Steingold [Wed, 22 Nov 2017 21:14:22 +0000 (16:14 -0500)]
Use special-mode for read-only buffers.

* lisp/progmodes/etags.el (tags-table-mode): Define using
`define-derived-mode', inheriting from `special-mode'.
Not only the buffer is now read-only, but you can bury it with "q".
(select-tags-table-mode): No need to set `buffer-read-only'
explicitly, `special-mode' takes care of that.
* lisp/vc/log-edit.el (log-edit-show-files): Use `special-mode'
instead of setting `buffer-read-only' explicitly.

7 years agoRemove variable alias executing-macro, obsolete since before 19.34.
Sam Steingold [Wed, 22 Nov 2017 21:07:54 +0000 (16:07 -0500)]
Remove variable alias executing-macro, obsolete since before 19.34.

7 years agoRemove *-yank-hooks aliases for -citation-hook, obsolete since 19.34.
Sam Steingold [Wed, 22 Nov 2017 21:05:45 +0000 (16:05 -0500)]
Remove *-yank-hooks aliases for -citation-hook, obsolete since 19.34.

* lisp/simple.el (compose-mail): Use `mail-citation-hook'
instead of `mail-yank-hooks'.
* lisp/mail/sendmail.el (mail-yank-hooks): Remove.
(mail-yank-original, mail-yank-region): Drop `mail-yank-hooks'.
* lisp/mh-e/mh-letter.el (mh-yank-hooks): Remove.
(mh-insert-prefix-string): Drop `mh-yank-hooks'.

7 years ago* src/fns.c (syms_of_fns) <overriding-plist-environment>: Doc fix.
Glenn Morris [Wed, 22 Nov 2017 19:58:55 +0000 (14:58 -0500)]
* src/fns.c (syms_of_fns) <overriding-plist-environment>: Doc fix.

7 years agoFix incorrect interaction of drag/drop and double click (bug#29121)
Alan Third [Wed, 22 Nov 2017 16:44:38 +0000 (16:44 +0000)]
Fix incorrect interaction of drag/drop and double click (bug#29121)

* src/nsterm.m (EmacsView::performDragOperation): Drag and drop
doesn't use ns-input-file.

7 years ago* lisp/menu-bar.el (menu-bar-options-save):
Glenn Morris [Wed, 22 Nov 2017 01:18:01 +0000 (20:18 -0500)]
* lisp/menu-bar.el (menu-bar-options-save):
Add display-line-numbers-type.

7 years ago* lisp/menu-bar.el (menu-bar-options-save):
Glenn Morris [Wed, 22 Nov 2017 00:42:32 +0000 (19:42 -0500)]
* lisp/menu-bar.el (menu-bar-options-save):
Add global-display-line-numbers-mode.  (Bug#28396)

7 years ago* lisp/follow.el (follow-mode): Restore mode line lighter. (Bug#28495)
Glenn Morris [Wed, 22 Nov 2017 00:23:30 +0000 (19:23 -0500)]
* lisp/follow.el (follow-mode): Restore mode line lighter.  (Bug#28495)

7 years ago; Compare process status against 127 exactly
Dmitry Gutov [Tue, 21 Nov 2017 23:50:07 +0000 (01:50 +0200)]
; Compare process status against 127 exactly

7 years agoExtract the common part of ruby-flymake-simple and ruby-flymake-rubocop
Dmitry Gutov [Tue, 21 Nov 2017 23:44:52 +0000 (01:44 +0200)]
Extract the common part of ruby-flymake-simple and ruby-flymake-rubocop

* lisp/progmodes/ruby-mode.el (ruby-flymake-simple)
(ruby-flymake-rubocop):
Extract the common part as ruby-flymake--helper.
(ruby--rubocop-flymake-proc): Remove.  Use the first proc
variable instead.

7 years agoAdd Rubocop Flymake backend
Dmitry Gutov [Tue, 21 Nov 2017 23:04:27 +0000 (01:04 +0200)]
Add Rubocop Flymake backend

* lisp/progmodes/ruby-mode.el (ruby-flymake-command):
Inline the value.  There are no known substitutes.
(ruby-flymake): Rename to `ruby-flymake-simple' and simplify
the docstring.
(ruby-flymake-use-rubocop-if-available): New option.
(ruby--rubocop-flymake-proc): New variable.
(ruby-rubocop-config): New option.
(ruby-flymake-rubocop, ruby-flymake-auto): New functions.
(ruby-mode): Use `ruby-flymake-auto'.

7 years ago; Fix a typo
Dmitry Gutov [Tue, 21 Nov 2017 22:46:59 +0000 (00:46 +0200)]
; Fix a typo

7 years agoUpdate nt/INSTALL.W64 (Bug#28601)
Noam Postavsky [Tue, 7 Nov 2017 23:01:01 +0000 (18:01 -0500)]
Update nt/INSTALL.W64 (Bug#28601)

* nt/INSTALL.W64 (Download and install MinGW-w64 and MSYS2): Move
suggestion about modifying PATH to...
(Test Emacs): ... here.
(Run configure): Remove the unnecessary setting of PKG_CONFIG_PATH.
(Troubleshooting): New section, includes suggestion to check
PKG_CONFIG_PATH.

7 years agoRemove incorrect NEWS item about VC state indicator (Bug#28817)
Charles A. Roelli [Tue, 21 Nov 2017 19:36:19 +0000 (20:36 +0100)]
Remove incorrect NEWS item about VC state indicator (Bug#28817)

* etc/NEWS (VC and related modes): Remove news item about the VC
state indicator.  This should have been done with commit 7882dc6
of 2016-03-06 'Revert "Use colors in the VC mode lines"'.

7 years ago* lisp/emacs-lisp/byte-run.el (defsubst): Doc fix.
Glenn Morris [Tue, 21 Nov 2017 18:28:00 +0000 (13:28 -0500)]
* lisp/emacs-lisp/byte-run.el (defsubst): Doc fix.

7 years agoMake c-defun-name analyze more thoroughly a function type which is a struct
Alan Mackenzie [Tue, 21 Nov 2017 18:06:11 +0000 (18:06 +0000)]
Make c-defun-name analyze more thoroughly a function type which is a struct

This fixes bug #29293.

* lisp/progmodes/cc-cmds.el (c-defun-name): When a struct (etc.) type is
encountered, check whether it is the return type of a function rather than a
declaration of the struct itself.  Similarly adapt the cond arm which deals
with functions properly to recognize struct return types.

7 years agoAvoid bogus abbreviated file names if HOME changes
Glenn Morris [Tue, 21 Nov 2017 17:27:36 +0000 (12:27 -0500)]
Avoid bogus abbreviated file names if HOME changes

* lisp/files.el (abbreviate-file-name):
If HOME changes, ignore `abbreviated-home-dir'.  (Bug#19657#20)
* test/lisp/files-tests.el (files-test-abbreviated-home-dir): New.

7 years ago* lisp/emacs-lisp/byte-run.el (inline): Give it a doc.
Glenn Morris [Tue, 21 Nov 2017 16:53:31 +0000 (08:53 -0800)]
* lisp/emacs-lisp/byte-run.el (inline): Give it a doc.

7 years agoFix erc keep-place module with new defaults (Bug#29111)
Jay Kamat [Tue, 21 Nov 2017 07:31:40 +0000 (08:31 +0100)]
Fix erc keep-place module with new defaults (Bug#29111)

* lisp/erc/erc-goodies.el (erc-keep-place): Allow erc
keep-place to continue working with
switch-to-buffer-preserve-window-point set to t, the new default.

Copyright-paperwork-exempt: yes

7 years agoFix lower case installer name
Phillip Lord [Mon, 20 Nov 2017 22:29:29 +0000 (22:29 +0000)]
Fix lower case installer name

* admin/nt/dist-build/build-zips.sh (build_installer):

7 years agoUse message instead of gnus-message in gnus-summary-current-score
Eric Abrahamsen [Mon, 20 Nov 2017 22:21:32 +0000 (14:21 -0800)]
Use message instead of gnus-message in gnus-summary-current-score

* lisp/gnus/gnus-score.el (gnus-summary-current-score): The only point
  of this function is to display the score to the user, there's no
  need to do gnus-message filtering.

7 years agoAdd window divider faces to NS (bug#29353)
Alan Third [Sun, 19 Nov 2017 11:45:55 +0000 (11:45 +0000)]
Add window divider faces to NS (bug#29353)

* src/nsterm.m (ns_draw_window_divider): Use
window-divider-first-pixel and window-divider-last-pixel faces.

7 years agoAdd date to snapshot file
Phillip Lord [Fri, 17 Nov 2017 23:07:38 +0000 (23:07 +0000)]
Add date to snapshot file

* admin/nt/dist-build/build-zips.sh: Add date to all out files.
* admin/nt/dist-build/emacs.nsi: Lower case and date installer.

7 years agoread_key_sequence: correct the handling of raw_keybuf in recursive calls
Alan Mackenzie [Mon, 20 Nov 2017 18:05:33 +0000 (18:05 +0000)]
read_key_sequence: correct the handling of raw_keybuf in recursive calls

This fixes bug #29349.

* src/keyboard.c (raw_keybuf_buffer, raw_keybuf_count_buffer): New variables
pointed to by ...
(raw_keybuf, raw_keybuf_count): Variables converted to pointers.
(GROW_RAW_KEYBUF): enhance with a length argument.
(command_loop_1): Initialize the above two pointers to their canonical values.

(read_key_sequence): In recursive calls (for menus) the function was
overwriting the raw event buffer of the outer call.  Correct this by
introducing a local buffer for each level of call, and setting this up to be
used by the call to read_char.  Any contents of this local buffer are appended
to the global buffer afterwards.

7 years ago; Merge from origin/emacs-26
Glenn Morris [Mon, 20 Nov 2017 18:10:11 +0000 (13:10 -0500)]
; Merge from origin/emacs-26

The following commit was skipped:

eb335c9 (origin/emacs-26) * src/keyboard.c: Undo last change, meant f...

7 years agoMerge from origin/emacs-26
Glenn Morris [Mon, 20 Nov 2017 18:10:11 +0000 (13:10 -0500)]
Merge from origin/emacs-26

fc5b8f1 Fix Bug#29149
5622b2e Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
4da8799 (emacs-26) Fix misbehavior when drawing three-pixel high hori...
1b082c8 MH-E: don't automatically download external-body parts
069f978 ; * lisp/emacs-lisp/byte-run.el: Fix a typo in a comment.
504a56c ; Fix last commit
a34e44e ; Fix last commit
a8892b4 Further fix for Bug#29291
d14923b Fix divider frame params on NS (bug#29352)
b2518ac Spelling fixes

# Conflicts:
# etc/NEWS
# test/lisp/net/tramp-tests.el