]> git.eshelyaron.com Git - emacs.git/log
emacs.git
8 years agoFix (next-frame nil t) crash (Bug#24281)
Martin Rudalics [Mon, 22 Aug 2016 06:33:48 +0000 (08:33 +0200)]
Fix (next-frame nil t) crash (Bug#24281)

* src/frame.c (candidate_frame): Check minibuf argument before
comparing it to zero (Bug#24281).

8 years agoFix semantics of 'minibuffer' frame parameter
Martin Rudalics [Sun, 21 Aug 2016 09:36:11 +0000 (11:36 +0200)]
Fix semantics of 'minibuffer' frame parameter

The 'minibuffer' frame parameter is now t for a normal frame
(a frame with a root window plus a minibuffer window) and the
frame's minibuffer window for a minibuffer-less frame (a frame
whose minibuffer window is on another frame).  See also:
https://lists.gnu.org/archive/html/emacs-devel/2016-07/msg01259.html

* src/frame.c (make_frame, make_frame_without_minibuffer)
(make_minibuffer_frame): When assigning the frame's minibuffer
window also store corresponding 'minibuffer' frame parameter.
(store_frame_param): Move the 'minibuffer' parameter checks to
the beginning so we can silently override the value before it
gets stored in the parameter alist.  Fix error handling.
(Fframe_parameters): Return value of 'minibuffer' parameter
unmodified.

* lisp/frameset.el (frameset-filter-minibuffer): When the cdr of
the parameter is a minibuffer window, save (minibuffer . nil)
instead of (minibuffer . t).
(frameset--reuse-frame): To find a non-minibuffer-only frame
look out for a frame whose 'minibuffer' parameter is t instead
of that frame's minibuffer window.
(frameset-minibufferless-first-p): To find a minibuffer-less
frame look out for a frame whose 'minibuffer' parameter is a
window instead of nil.

8 years ago* lisp/progmodes/cc-defs.el (c-safe-scan-lists): Resolve overelaborate "nil"
Alan Mackenzie [Sat, 20 Aug 2016 20:46:39 +0000 (20:46 +0000)]
* lisp/progmodes/cc-defs.el (c-safe-scan-lists): Resolve overelaborate "nil"

8 years agoIn c-\(go-\)?-\(up-\|down-\)?list-\(forward\|backward\) check limit isn't nil
Alan Mackenzie [Sat, 20 Aug 2016 14:12:06 +0000 (14:12 +0000)]
In c-\(go-\)?-\(up-\|down-\)?list-\(forward\|backward\) check limit isn't nil

Check the limit both at macro expansion time (for a hard coded nil) and at run
time in the generated code.  Tidy up these macros generally.

* lisp/progmodes/cc-defs.el (c-safe-scan-lists): Check `limit' is present and
not identically nil before generating a narrow-to-region call.  Generate code
to check `limit' is not nil at run time.
(c-go-list-forward, c-go-list-backward): Remove the generation of redundant
narrow-to-region, instead calling c-safe-scan-lists directly.
(c-go-up-list-forward, c-go-up-list-backward, c-go-down-list-forward)
(c-go-down-list-backward): Invoke the corresponding macros without the "go-"
to determine the destination position instead of generating a redundant
narrow-to-region.

8 years ago* lisp/emacs-lisp/map.el (map--dispatch): Fix docstring
Robert Cochran [Fri, 19 Aug 2016 21:53:07 +0000 (14:53 -0700)]
* lisp/emacs-lisp/map.el (map--dispatch): Fix docstring

The docstring referenced a non-existant parameter, as well as a
parameter that has been renamed since the docstring was written. Fix
both errors, fixing (Bug#24182).

8 years agoAmend hack-local-variables-prop-line not always to return any mode on line 1.
Alan Mackenzie [Fri, 19 Aug 2016 16:03:05 +0000 (16:03 +0000)]
Amend hack-local-variables-prop-line not always to return any mode on line 1.

This fixes bug #24266.

* lisp/files.el (hack-local-variables-prop-line): Change the name of the
parameter mode-only to handle-mode.  Change its meaning, such that it being
set to a value non-nil and not t removes any mode parameter from the result
list.  Leave its values nil and t with the same meanings they had.
(hack-local-variables): Call hack-local-variables-prop-line appropriately.

8 years agoImprove doc string of epg-*-program
Daiki Ueno [Fri, 19 Aug 2016 09:18:41 +0000 (11:18 +0200)]
Improve doc string of epg-*-program

* lisp/epg-config.el (epg-gpg-program, epg-gpgsm-program):
Suggest to use Customize when setting.  (Bug#24229)

8 years agoAdd tests for Bug#24264
Tino Calancha [Fri, 19 Aug 2016 08:04:42 +0000 (17:04 +0900)]
Add tests for Bug#24264

* test/lisp/emacs-lisp/cl-seq-tests.el (cl-seq-test-bug24264):
Add test for Bug#24264.
(cl-seq-fill-test, cl-seq-replace-test)
(cl-seq-remove-test ,cl-seq-delete-test)
(cl-seq-remove-duplicates-test, cl-seq-substitute-test)
(cl-seq-nsubstitute-test, cl-seq-position-test)
(cl-seq-count-test, cl-seq-mismatch-test)
(cl-seq-search-test, cl-seq-test-bug24264):
Add tests for all functions in the file; test all keywords.

8 years agoFix bug in --eval reply message from server
Johan Bockgård [Thu, 18 Aug 2016 19:25:11 +0000 (21:25 +0200)]
Fix bug in --eval reply message from server

* lisp/server.el (server-reply-print): Fix check for truncated quote
sequence at end of message. Problem reported in:
http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00101.html

8 years agoAdd tests for 'substitute-command-keys'
Eli Zaretskii [Thu, 18 Aug 2016 15:06:33 +0000 (18:06 +0300)]
Add tests for 'substitute-command-keys'

* test/src/doc-tests.el (doc-test-substitute-command-keys): New
tests.

8 years agolisp/textmodes/table.el (table-generate-source): Fix completing-read call
Oleh Krehel [Thu, 18 Aug 2016 14:05:29 +0000 (16:05 +0200)]
lisp/textmodes/table.el (table-generate-source): Fix completing-read call

Doesn't make sense to pass '(("html") ("latex") ("cals")) to
`completing-read'.

8 years agolisp/dired-aux.el (dired-compress-file-suffixes): Add entry for tgz
Oleh Krehel [Thu, 14 Jul 2016 09:40:53 +0000 (11:40 +0200)]
lisp/dired-aux.el (dired-compress-file-suffixes): Add entry for tgz

The previous behavior resulted in a "tgz" -> "tar" -> "tgz" loop,
without any files being extracted.

8 years agoDon't let window start override window point in `window-state-put' (Bug#24240)
Andreas Politz [Thu, 18 Aug 2016 08:27:05 +0000 (10:27 +0200)]
Don't let window start override window point in `window-state-put' (Bug#24240)

* lisp/window.el (window--state-put-2): Set 'noforce argument
when restoring a window's start position.  This avoids that the
effect of `set-window-point' gets overidden by that of
`set-window-start' (Bug#24240).

8 years agoFontify constructs following "::" in C++ argument lists correctly - part 2.
Alan Mackenzie [Wed, 17 Aug 2016 19:37:19 +0000 (19:37 +0000)]
Fontify constructs following "::" in C++ argument lists correctly - part 2.

This fixes bug #24246.

* lisp/progmodes/cc-engine.el (c-find-decl-prefix-search): Put a
`save-match-data' around the new `looking-at' introduced by the previous CC
Mode patch this evening.

8 years agoFontify constructs following "::" in C++ argument lists correctly.
Alan Mackenzie [Wed, 17 Aug 2016 18:06:24 +0000 (18:06 +0000)]
Fontify constructs following "::" in C++ argument lists correctly.

This fixes bug #24246.

* lisp/progmodes/cc-engine.el (c-find-decl-prefix-search): In the "pseudo
match" loop, test a found string for a match with c-opt-identifier-concat-key
(e.g. with "::").

8 years ago* src/doc.c (Fsubstitute_command_keys): Clarify GC comments.
Paul Eggert [Wed, 17 Aug 2016 17:15:53 +0000 (10:15 -0700)]
* src/doc.c (Fsubstitute_command_keys): Clarify GC comments.

8 years agoFix hz encoding and decoding (bug#23814)
K. Handa [Wed, 17 Aug 2016 14:37:17 +0000 (23:37 +0900)]
Fix hz encoding and decoding (bug#23814)

* lisp/language/china-util.el (decode-hz-region): Pay
attention to "~~}" sequence at the end of Chinese character
range.
(hz-category-table): New variable.
(encode-hz-region): Convert non-encodable characters to
\u... and \U...  Preserve ESC on ecoding.  Put
`chinese-gb2312' `charset' text property in advance to force
iso-2022-encoding to select chinese-gb2312 designation.

8 years agofile-attribute-collect: New defun
Tino Calancha [Wed, 17 Aug 2016 09:25:54 +0000 (18:25 +0900)]
file-attribute-collect: New defun

* lisp/files.el (file-attribute-collect):
Return a sublist of the attributes returned by 'file-attributes'.
Suggested by Ted Zlatanov in:

http://lists.gnu.org/archive/html/emacs-devel/2016-07/msg01195.html
; * etc/NEWS: Mention this defun in NEWS.

8 years agoFix Bug#24203
Michael Albinus [Wed, 17 Aug 2016 08:10:47 +0000 (10:10 +0200)]
Fix Bug#24203

* lisp/comint.el (comint-password-prompt-regexp): Relax regexp.  (Bug#24203)

8 years agoImprove doc string.
Karl Fogel [Tue, 16 Aug 2016 20:25:52 +0000 (15:25 -0500)]
Improve doc string.

* src/fileio.c (Ffile_name_as_directory): Be precise about the
conditions under which a slash is appended.

8 years agoOmit substitute-command-keys code no longer needed
Paul Eggert [Tue, 16 Aug 2016 20:16:49 +0000 (13:16 -0700)]
Omit substitute-command-keys code no longer needed

* src/doc.c (Fsubstitute_command_keys):
Remove duplicate initializations.

8 years agoAllow not erase output buffer in shell commands
Tino Calancha [Tue, 16 Aug 2016 09:18:44 +0000 (18:18 +0900)]
Allow not erase output buffer in shell commands

* lisp/simple.el (shell-command-not-erase-buffer): New option to allow
not erasing the output buffer between shell commands.  Defaults to nil.
(shell-command-on-region): Use it.
(shell-command--save-pos-or-erase): New defun; store a buffer position
if 'shell-command-not-erase-buffer' is non-nil; otherwise
erase the output buffer of the shell command.
(shell-command, shell-command-on-region): Use it.
(shell-command--set-point-after-cmd): New defun;
if 'shell-command-not-erase-buffer' is non-nil, set point
in the output buffer to the position in 'shell-command-saved-pos'.
(shell-command-sentinel, shell-command-on-region): Use it.
* doc/emacs/misc.texi (shell-command-not-erase-buffer):
Document this feature in the manual.
; * etc/NEWS: Add entry for this new feature.
See discussion on:
http://lists.gnu.org/archive/html/emacs-devel/2016-07/msg00610.html

8 years agoRearrange Tramp manual title page
Michael Albinus [Tue, 16 Aug 2016 07:48:24 +0000 (09:48 +0200)]
Rearrange Tramp manual title page

* doc/misc/tramp.texi: Move @insertcopying out of the title
page.  Do not use @ifnottex anymore.

8 years ago* doc/misc/tramp.texi: Adapt 2016-08-14 change for makeinfo 4.
Glenn Morris [Mon, 15 Aug 2016 16:48:01 +0000 (12:48 -0400)]
* doc/misc/tramp.texi: Adapt 2016-08-14 change for makeinfo 4.

8 years agoFix minor bug in c-syntactic-re-search-forward.
Alan Mackenzie [Mon, 15 Aug 2016 16:22:36 +0000 (16:22 +0000)]
Fix minor bug in c-syntactic-re-search-forward.

Bug was: when NOERROR is neither nil nor t, BOUND is non-nil, PAREN-LEVEL is
non-nil, and the first internal search attempt fails, point wrongly ends up at
BOUND, rather than just before the next closing paren.

* lisp/progmodes/cc-engine.el (c-syntactic-re-search-forward): Guard against
the above situation.

8 years agoHandle C++11 lambda functions.
Alan Mackenzie [Mon, 15 Aug 2016 11:52:32 +0000 (11:52 +0000)]
Handle C++11 lambda functions.

* lisp/progmodes/cc-engine.el (c-looking-at-inexpr-block): Enhance also to
handle C++ lambda functions.
(c-looking-at-c++-lambda-capture-list): New function.

* lisp/progmodes/cc-fonts.el (c-font-lock-declarations): Recognize the
parameter list of a lambda function and set `context' and
`c-restricted-<>-arglists' suitably for it.
(c-font-lock-c++-lambda-captures): New function.
(c-complex-decl-matchers): Insert c-font-lock-c++-lambda-captures into it.

* lisp/progmodes/cc-langs.el (c-pre-lambda-tokens, c-pre-lambda-tokens-re):
New language constants/variables.
(c-paren-nontype-kwds): Include "noexcept" in the C++ value.

* lisp/progmodes/cc-mode.el (c-fl-decl-start): Handle being in a C++ lambda
function capture list.

8 years agoFix stale cache problem in Tramp
Michael Albinus [Mon, 15 Aug 2016 10:29:20 +0000 (12:29 +0200)]
Fix stale cache problem in Tramp

* lisp/net/tramp-cache.el (tramp-get-connection-property):
Check, that a process as key is still running.  (Bug#22478)

8 years ago* doc/misc/tramp.texi (Configuration): Fix @xref typo.
Paul Eggert [Sun, 14 Aug 2016 20:05:22 +0000 (15:05 -0500)]
* doc/misc/tramp.texi (Configuration): Fix @xref typo.

8 years agoAnother fix for scroll-conservatively and overlay strings
Eli Zaretskii [Sun, 14 Aug 2016 18:25:52 +0000 (21:25 +0300)]
Another fix for scroll-conservatively and overlay strings

* src/xdisp.c (redisplay_window): Handle also the case where the
calculated window-start point has an overlay string touching it.
(Bug#24179)

8 years agoImprove handling of defcustoms in tramp
Michael Albinus [Sun, 14 Aug 2016 11:31:07 +0000 (13:31 +0200)]
Improve handling of defcustoms in tramp

* doc/misc/tramp.texi: Protect all multi-line examples by
@group ... @end group.  Use proper `custom-set-variables'
examples.  Use consequently @option for user options.  Remove
superfluous @cindex and @vindex entries.
(Top): Remove reference to outdated mail archives.
(Configuration): Tune references.
(Default Method): Make `tramp-default-method' and
`tramp-default-method-alist' a @defopt.
(Default User): Make `tramp-default-user' and
`tramp-default-user-alist' a @defopt.
(Default Host): Make `tramp-default-host' and
`tramp-default-host-alist' a @defopt.

* lisp/net/tramp.el (tramp-mode, tramp-verbose)
(tramp-backup-directory-alist, tramp-auto-save-directory)
(tramp-encoding-shell, tramp-encoding-command-switch)
(tramp-encoding-command-interactive, tramp-default-method)
(tramp-default-method-alist, tramp-default-user)
(tramp-default-user-alist, tramp-default-host)
(tramp-default-host-alist, tramp-default-proxies-alist)
(tramp-save-ad-hoc-proxies)
(tramp-restricted-shell-hosts-alist)
(tramp-local-end-of-line, tramp-rsh-end-of-line)
(tramp-login-prompt-regexp, tramp-shell-prompt-pattern)
(tramp-password-prompt-regexp, tramp-wrong-passwd-regexp)
(tramp-yesno-prompt-regexp, tramp-yn-prompt-regexp)
(tramp-terminal-prompt-regexp)
(tramp-operation-not-permitted-regexp)
(tramp-copy-failed-regexp, tramp-process-alive-regexp)
(tramp-syntax, tramp-chunksize)
(tramp-process-connection-type, tramp-connection-timeout)
(tramp-connection-min-time-diff)
(tramp-completion-reread-directory-timeout):
* lisp/net/tramp-adb.el (tramp-adb-program)
(tramp-adb-connect-if-not-connected, tramp-adb-prompt):
* lisp/net/tramp-cache.el (tramp-connection-properties)
(tramp-persistency-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods)
(tramp-gvfs-zeroconf-domain)
(tramp-bluez-discover-devices-timeout):
* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
(tramp-copy-size-limit, tramp-terminal-type)
(tramp-histfile-override)
(tramp-use-ssh-controlmaster-options, tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args):
* lisp/net/tramp-smb.el (tramp-smb-program, tramp-smb-acl-program)
(tramp-smb-conf, tramp-smb-winexe-program)
(tramp-smb-winexe-shell-command)
(tramp-smb-winexe-shell-command-switch): Add :require 'tramp.

8 years agoMinor text-quoting-style fixes
Paul Eggert [Sun, 14 Aug 2016 04:30:55 +0000 (23:30 -0500)]
Minor text-quoting-style fixes

* lisp/cus-edit.el (custom-buffer-create-internal):
* lisp/recentf.el (recentf-edit-list):
Follow text-quoting-style preference when quoting in UI strings.
* src/doc.c (Fsubstitute_command_keys): Don’t say that curved
quotes are substituted for, as this is no longer true.

8 years agoFix substitute-command-keys unibyte, alloc bugs
Paul Eggert [Sun, 14 Aug 2016 04:26:00 +0000 (23:26 -0500)]
Fix substitute-command-keys unibyte, alloc bugs

* src/doc.c (Fsubstitute_command_keys): Fix some problems with
unibyte strings and with buffer allocation.  Make strings
multibyte, to avoid problems with unibyte strings that are not
valid UTF-8 (Bug#24206).  Redo buffer allocation so that it is
O(N), not O(N**2).  Avoid going past the end of the input string
when given invalid input.  Avoid some unlikely problems in
accessing the wrong storage after a GC.

8 years agoFix "C-u" when an input method is active
Joakim Jalap [Sat, 13 Aug 2016 09:26:27 +0000 (12:26 +0300)]
Fix "C-u" when an input method is active

* lisp/international/quail.el (quail-input-method): Defer to the
input method iff 'overriding-terminal-local-map' is
'universal-argument-map' and the given key has no binding there.
(Bug#22958)

8 years agoFix docs on `display-buffer-below-selected' (Bug#24213)
Martin Rudalics [Sat, 13 Aug 2016 07:59:14 +0000 (09:59 +0200)]
Fix docs on `display-buffer-below-selected' (Bug#24213)

* lisp/window.el (display-buffer-below-selected): Fix
doc-string (Bug#24213).
* doc/lispref/windows.texi (Display Action Functions): Fix
documentation of `display-buffer-below-selected'.

8 years agocl-fill: Rename arguments to cl-seq and cl-item
Tino Calancha [Sat, 13 Aug 2016 04:25:15 +0000 (13:25 +0900)]
cl-fill: Rename arguments to cl-seq and cl-item

* lisp/emacs-lisp/cl-seq.el (cl-fill):
Rename arguments to 'cl-seq' and 'cl-item' as elsewhere.

8 years agoFix display.texi typo
Thomas Fitzsimmons [Sat, 13 Aug 2016 01:50:43 +0000 (21:50 -0400)]
Fix display.texi typo

* doc/lispref/display.texi (Faces): Fix typo.

8 years agoFix process leak with make-network-process
Paul Eggert [Thu, 11 Aug 2016 18:24:54 +0000 (11:24 -0700)]
Fix process leak with make-network-process

This problem was introduced by the recent async changes (Bug#23808).
* src/process.c (Fmake_process): Move USE_SAFE_ALLOCA later,
so that it follows the start_process_unwind unwind-protect.
Set pid to -1 while the process is being created.
(start_process_unwind): Omit unnecessary emacs_abort test.
(connect_network_socket): Simplify use of counts.  Unwind
bind_polling_period a bit earlier, so that a remove_process
unwind-protect can be added when needed; this is the heart of
the fix.  Undo the unwind-protect just before returning.

8 years agoAvoid annoying re-scroll when buffer has many overlay strings
Eli Zaretskii [Thu, 11 Aug 2016 15:04:42 +0000 (18:04 +0300)]
Avoid annoying re-scroll when buffer has many overlay strings

* src/xdisp.c (redisplay_window): Add better recovery from a
situation where window-start is on buffer position which has a
before-string that includes newlines, with the result that point
is not visible in the window, because the display engine starts
displaying with the before-string.  (Bug#24179)

8 years agoOmit unnecessary process initialization
Paul Eggert [Wed, 10 Aug 2016 20:19:15 +0000 (13:19 -0700)]
Omit unnecessary process initialization

* src/process.c (make_process, Fmake_process)
(Fmake_pipe_process, Fmake_serial_process)
(Fmake_network_process, server_accept_connection):
Omit unnecessary initialization of already-cleared storage.

8 years agocl-delete-duplicates: Parse :if to have cl-if bound
Tino Calancha [Wed, 10 Aug 2016 14:23:18 +0000 (23:23 +0900)]
cl-delete-duplicates: Parse :if to have cl-if bound

* lisp/emacs-lisp/cl-seq.el (cl--delete-duplicates):
We need also to parse keyword :if, otherwise cl-if
is unbound.
This reverts commit:
68fdbeb917b80e29e0b15506f18f7ed41d8ffdfd

8 years agocl-delete-duplicates: do not parse :if keyword
Tino Calancha [Wed, 10 Aug 2016 13:34:21 +0000 (22:34 +0900)]
cl-delete-duplicates: do not parse :if keyword

* lisp/emacs-lisp/cl-seq.el (cl--delete-duplicates):
Parse only the supported keywords.

8 years agoAdd compatibility layer for `temporary-file-directory-function'
Michael Albinus [Wed, 10 Aug 2016 10:10:26 +0000 (12:10 +0200)]
Add compatibility layer for `temporary-file-directory-function'

* lisp/net/tramp-compat.el
(tramp-compat-temporary-file-directory-function): New defalias.

* lisp/net/tramp.el (tramp-handle-make-nearby-temp-file): Use it.

* test/lisp/net/tramp-tests.el (tramp-test32-make-nearby-temp-file):
Skip for older Emacs versions.

8 years ago* lisp/comint.el (comint-password-prompt-regexp): Add "PEM" for OpenVPN.
Michael Albinus [Wed, 10 Aug 2016 10:09:12 +0000 (12:09 +0200)]
* lisp/comint.el (comint-password-prompt-regexp): Add "PEM" for OpenVPN.

(Bug#24059)

8 years agoMerge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Vincent Belaïche [Wed, 10 Aug 2016 08:14:29 +0000 (10:14 +0200)]
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

8 years agoHandle nil cell value in compiled printer functions.
Vincent Belaïche [Wed, 10 Aug 2016 08:13:27 +0000 (10:13 +0200)]
Handle nil cell value in compiled printer functions.

* doc/misc/ses.texi (Quick Tutorial): Minor clarification about the
ses-range `!' modifier.
(More on cell printing): Fix this that the fallback printer is
`ses-prin1', not "%S".  That makes a difference for any cell value for
which "%S" would insert a backslash characters.

* lisp/ses.el (ses-local-printer-compile): Handle the nil cell value
--- contrary to emacs-25 branches ses-call-printer does not handle
prior to calling a function printer.  Not doing this would still work
because the compiled function would throw and error and SES would in
the end resort to the ses-prin1 fallback, however this way would not
be in line with the raison d'être of compiling printer which is speed.

8 years agoTurn on lexical-binding in json.el
Mark Oteiza [Wed, 10 Aug 2016 04:42:40 +0000 (00:42 -0400)]
Turn on lexical-binding in json.el

Measuring with (benchmark-run 100 (json-read-file "foobar.json"))
showed 12-31% reduction in execution time.
* lisp/json.el: Turn on lexical-binding.

8 years agoNudge WoMan toward lexical-binding
Mark Oteiza [Wed, 10 Aug 2016 04:15:55 +0000 (00:15 -0400)]
Nudge WoMan toward lexical-binding

* lisp/woman.el (woman-parse-man.conf, woman-manpath-add-locales):
Use cl-pushnew instead of add-to-list.
(woman-justify-list): Rename to woman-justify-styles.
(woman-justify-styles): New array.
(woman-justify, woman-decode-region, woman2-ad, woman2-na): Use it.
(woman-cached-data): Use cl-pushnew instead of add-to-list.

8 years agoApply changes from commits 3c97b0f758 and 8a38e948b0 to master branch.
Vincent Belaïche [Tue, 9 Aug 2016 21:46:13 +0000 (23:46 +0200)]
Apply changes from commits 3c97b0f758 and 8a38e948b0 to master branch.

Here follows the logs from the two commits which I apply to master.

commit 3c97b0f7589e06aeb1ab0147f0ee32974c32926d
Author: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date:   Fri Jul 29 13:44:14 2016 +0200

Fix ses-delete-blanks to delete only blanks + documentation.

* doc/misc/ses.texi (Quick Tutorial): Mention the '!'
'ses-range' modifier as an alternative to 'ses+'.
(Advanced Features): Add a refernce to node 'Nonrelocatable
references' concerning function 'ses-rename-cell'.
(Standard formula functions): Mention the '!' 'ses-range'
modifier as an alternative to 'ses-delete-blanks'.
(More on cell printing): Fix fallback printer
definition.  Minor editorial formatting changes.
(Nonrelocatable references): Document the use of
'ses-rename-cell' as a better way to make cell reference
non-relocatable.
(The data area): Document the presence of local printer
definitions in the data area.

* lisp/ses.el (ses-delete-blanks): Do not remove
*error*.  Any error in an argument should propagate into the
using formula rather than being silently hidden !

commit 8a38e948b039516e70176ebe20c5349e2ade6ac5
Author: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date:   Thu Jul 28 19:49:37 2016 +0200

Fix local printer set to left aligned string formatter.

* lisp/ses.el (ses-local-printer-compile): Add missing case
for left-aligned string formatter.

8 years ago* .dir-locals.el (c-noise-macro-names): Remove NONVOLATILE.
Paul Eggert [Tue, 9 Aug 2016 18:50:44 +0000 (11:50 -0700)]
* .dir-locals.el (c-noise-macro-names): Remove NONVOLATILE.

8 years ago* lisp/emacs-lisp/cconv.el: Fix λ-lifting in the presence of shadowing
Stefan Monnier [Tue, 9 Aug 2016 17:05:03 +0000 (13:05 -0400)]
* lisp/emacs-lisp/cconv.el: Fix λ-lifting in the presence of shadowing

Change the code which detects and circumvents the case where one of the
variables used in λ-lifting is shadowed, so that it also works when the
shadowing comes before the λ-lifted function (bug#24171).

(cconv--remap-llv): New function, extracted from cconv-convert.
(cconv-convert): Use it, but differently for `let' and `let*'.

8 years agoCC Mode: check for and fix missing call to before_change_functions.
Alan Mackenzie [Tue, 9 Aug 2016 16:09:18 +0000 (16:09 +0000)]
CC Mode: check for and fix missing call to before_change_functions.

Fixes bug #24094 and bug #24074.

This can happen with `revert-buffer' or sometimes `find-file', when the file
is already in a buffer, but the file has been changed outside of Emacs.

* lisp/progmodes/cc-mode (c-after-change): When we detect a missing
invocation of c-before-change-functions, we assume the changed region is the
entire buffer, and call c-before-change explicitly before proceding.

8 years agoMake c-deprepertize-CPP work on deletion/insertion of "s. Fixes bug #24132.
Alan Mackenzie [Tue, 9 Aug 2016 10:23:31 +0000 (10:23 +0000)]
Make c-deprepertize-CPP work on deletion/insertion of "s.  Fixes bug #24132.

* lisp/progmodes/cc-mode.el (c-depropertize-CPP): Rewrite function.

8 years agoSupport $ENV in Tramp
Michael Albinus [Tue, 9 Aug 2016 09:50:13 +0000 (11:50 +0200)]
Support $ENV in Tramp

* doc/misc/tramp.texi (Remote processes): Explain setting $ENV.

* etc/NEWS: Explain the "ENV" environment variable in
`tramp-remote-process-environment'.

* lisp/net/tramp-sh.el (tramp-remote-process-environment): Add "ENV=''".
(tramp-open-shell): Read $ENV value from
`tramp-remote-process-environment'.
(tramp-open-connection-setup-interactive-shell): Set values in
proper order.

8 years agoSimplify exec_byte_code via moving decls etc.
Paul Eggert [Tue, 9 Aug 2016 07:37:41 +0000 (00:37 -0700)]
Simplify exec_byte_code via moving decls etc.

* src/bytecode.c (exec_byte_code): Simplify, mostly by moving
initializers into decls, and by omitting some unnecessary
changes to ‘top’.  This improves performance a bit on x86-64,
as it happens.

8 years agoRemove interpreter’s byte stack
Paul Eggert [Tue, 9 Aug 2016 07:37:40 +0000 (00:37 -0700)]
Remove interpreter’s byte stack

This improves performance overall on my benchmark on x86-64,
since the interpreted program-counter resides in a machine
register rather than in RAM.
* etc/DEBUG, src/.gdbinit: Remove xbytecode GDB command, as there
is no longer a byte stack to decode.
* src/bytecode.c (struct byte_stack, byte_stack_list)
(relocate_byte_stack): Remove.  All uses removed.
(FETCH): Simplify now that pc is now local (typically, in a
register) and no longer needs to be relocated.
(CHECK_RANGE): Remove.  All uses now done inline, in a different way.
(BYTE_CODE_QUIT): Remove; now done by op_relative_branch.
(exec_byte_code): Allocate a copy of the function’s bytecode,
so that there is no problem if GC moves it.
* src/lisp.h (struct handler): Remove byte_stack member.
All uses removed.
(SAFE_ALLOCA_LISP_EXTRA): New macro, a generalization of
SAFE_ALLOCA_LISP.
(SAFE_ALLOCA_LISP): Use it.

8 years agoRemove arbitrary limit on bytecode maxdepth
Paul Eggert [Tue, 9 Aug 2016 07:37:39 +0000 (00:37 -0700)]
Remove arbitrary limit on bytecode maxdepth

* src/bytecode.c (exec_byte_code): Remove MAX_ALLOCA-based limit
on bytecode maxdepth, by using SAFE_ALLOCA_LISP instead of alloca.

pipeline is fuller.

8 years agoTune bytecode quitting
Paul Eggert [Tue, 9 Aug 2016 07:37:39 +0000 (00:37 -0700)]
Tune bytecode quitting

* src/bytecode.c (BYTE_CODE_QUIT): Check for GC, too.  Do the
check only once every 256 times.  This should be good enough, and
improves performance significantly on x86-64 as branch-prediction
typically assumes checking will not be done so the instruction
pipeline stays fuller.
(exec_byte_code): Set up the quit counter.  Don’t call maybe_gc
directly, as BYTE_CODE_QUIT does that now.

8 years agoSimplify BYTE_CODE_SAFE checking
Paul Eggert [Tue, 9 Aug 2016 07:37:38 +0000 (00:37 -0700)]
Simplify BYTE_CODE_SAFE checking

* src/bytecode.c (BYTE_CODE_SAFE): Default to false, so that it
can be used outside #if.  All uses of ‘defined BYTE_CODE_SAFE’
changed to ‘BYTE_CODE_SAFE’.  Use BYTE_CODE_SAFE in plain
expressions instead of #if expressions when this is easy.
(struct byte_stack) [BYTE_CODE_SAFE]: Remove member ‘bottom’,
as it is no longer needed.
(exec_byte_code): Omit #if BYTE_CODE_SAFE when this is easy.
Simplify stack-overflow checking when BYTE_CODE_SAFE.

8 years agoGet BYTE_CODE_METER working again
Paul Eggert [Tue, 9 Aug 2016 07:35:13 +0000 (00:35 -0700)]
Get BYTE_CODE_METER working again

BYTE_CODE_METER hasn’t worked since 2013, and nobody seems to have
noticed.  Perhaps we should remove it?
* src/bytecode.c (METER_2) [BYTE_CODE_METER]:
Use *aref_addr instead of AREF, since it needs to be an lvalue.

8 years agoFix cursor position under scroll-conservatively and overlay strings
Eli Zaretskii [Mon, 8 Aug 2016 15:15:55 +0000 (18:15 +0300)]
Fix cursor position under scroll-conservatively and overlay strings

* src/xdisp.c (try_scrolling): Handle the case where the last
visible screen line of a window displays a before- or after-string
that takes up the whole screen line, and therefore there's no
place to display the cursor, even though the window does seem to
include the position of point.  (Bug#24179)

8 years ago* lisp/files.el (file-ownership-preserved-p): Fix docstring. (Bug#23998)
Michael Albinus [Mon, 8 Aug 2016 08:58:29 +0000 (10:58 +0200)]
* lisp/files.el (file-ownership-preserved-p): Fix docstring.  (Bug#23998)

8 years agoTune interpretation of integer arglist descriptor
Paul Eggert [Sun, 7 Aug 2016 16:58:09 +0000 (09:58 -0700)]
Tune interpretation of integer arglist descriptor

* src/bytecode.c (exec_byte_code):
Simplify and tune when INTEGERP (args_template).

8 years agoFix debugging of string-match-p errors
Noam Postavsky [Sat, 6 Aug 2016 02:11:00 +0000 (22:11 -0400)]
Fix debugging of string-match-p errors

* src/eval.c (call_debugger): Bind inhibit-changing-match-data to nil so
that debugger code that needs to do regexp match won't break
(Bug #23949, Bug #24166, Bug#16294).

8 years agoAdd `make-nearby-temp-file' and `temporary-file-directory'
Michael Albinus [Sun, 7 Aug 2016 11:57:23 +0000 (13:57 +0200)]
Add `make-nearby-temp-file' and `temporary-file-directory'

* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.

* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.

* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.

* 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-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.

* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.

* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.

* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.

* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.

8 years agoAdd missing dcstrings in Tramp, remove chec for obsolee methods
Michael Albinus [Sun, 7 Aug 2016 06:45:12 +0000 (08:45 +0200)]
Add missing dcstrings in Tramp, remove chec for obsolee methods

* lisp/net/tramp.el (tramp-progress-reporter-update)
(tramp-unload-file-name-handlers, tramp-get-local-uid)
(tramp-get-local-gid, tramp-get-local-locale):
* lisp/net/tramp-adb.el (tramp-adb-ls-date-regexp)
(tramp-adb-ls-toolbox-regexp, tramp-adb-get-ls-command):
* lisp/net/tramp-compat.el (tramp-compat-funcall):
* lisp/net/tramp-ftp.el (tramp-ftp-enable-ange-ftp):
* lisp/net/tramp-gw.el (tramp-gw-process-filter):
* lisp/net/tramp-sh.el (tramp-get-remote-path)
(tramp-get-remote-locale, tramp-get-ls-command)
(tramp-get-ls-command-with-dired)
(tramp-get-ls-command-with-quoting-style)
(tramp-get-ls-command-with-w-option)
(tramp-get-test-nt-command, tramp-get-file-exists-command)
(tramp-get-remote-ln, tramp-get-remote-perl)
(tramp-get-remote-stat, tramp-get-remote-readlink)
(tramp-get-remote-trash, tramp-get-remote-touch)
(tramp-get-remote-gvfs-monitor-dir)
(tramp-get-remote-inotifywait, tramp-get-remote-id)
(tramp-get-remote-uid-with-id)
(tramp-get-remote-uid-with-perl, tramp-get-remote-python)
(tramp-get-remote-uid-with-python, tramp-get-remote-uid)
(tramp-get-remote-gid-with-id)
(tramp-get-remote-gid-with-perl)
(tramp-get-remote-gid-with-python, tramp-get-remote-gid)
(tramp-get-env-with-u-option): Add missing docstrings.

* lisp/net/tramp.el (tramp-obsolete-methods)
(tramp-warned-obsolete-methods): Remove.
(tramp-find-method): Do not check for obsolete methods any longer.

8 years agoMake sh-mode always use p-s-lookup-properties
Noam Postavsky [Fri, 8 Jul 2016 01:14:48 +0000 (21:14 -0400)]
Make sh-mode always use p-s-lookup-properties

This lets functions which rely on syntax-propertize for parsing
work correctly even before font lock has a chance to run.

* lisp/progmodes/sh-script.el (sh-set-shell): Set
parse-sexp-lookup-properties unconditionally (Bug #4920).

8 years agoFix cl-assert with atomp FORM, non-nil SHOW-ARGS
Noam Postavsky [Mon, 4 Jul 2016 03:44:14 +0000 (23:44 -0400)]
Fix cl-assert with atomp FORM, non-nil SHOW-ARGS

* lisp/emacs-lisp/cl-macs.el (cl-assert): Don't require that FORM is a
list when showing its (non-existent) arguments (Bug #18587).

8 years agoDon't delete selection after indent-rigidly
Noam Postavsky [Sun, 3 Jul 2016 18:00:19 +0000 (14:00 -0400)]
Don't delete selection after indent-rigidly

* lisp/indent.el (indent-rigidly): Pass `deactivate-mark' as the ON-EXIT
function to `set-transient-map', this prevents `delete-selection-mode'
from deleting the text that was just indented (Bug #20408).

8 years agoFix byte-compile of interactive closures
Noam Postavsky [Mon, 1 Aug 2016 00:46:37 +0000 (20:46 -0400)]
Fix byte-compile of interactive closures

* lisp/emacs-lisp/bytecomp.el (byte-compile--reify-function): Put
bindings after docstring and `interactive' form, if any (Bug #24122).

8 years agoError if --eval arg has text beyond 1 expression
Noam Postavsky [Sun, 3 Jul 2016 00:26:35 +0000 (20:26 -0400)]
Error if --eval arg has text beyond 1 expression

* lisp/startup.el (command-line-1): If --eval argument has more data
than constitutes a single Lisp expression, signal an error (Bug #23159).

8 years agoFix quoted lambda warning from lexical-let
Noam Postavsky [Fri, 10 Jun 2016 01:54:13 +0000 (21:54 -0400)]
Fix quoted lambda warning from lexical-let

* lisp/emacs-lisp/cl.el (cl--function-convert): Quote the inner lambda
with `function', not `quote' (Bug #11357).

8 years agoMake emerge always use shell-quote-argument
Noam Postavsky [Sat, 6 Aug 2016 13:51:15 +0000 (09:51 -0400)]
Make emerge always use shell-quote-argument

* lisp/vc/emerge.el (emerge-metachars): Obsolete.
(emerge-protect-metachars): Delete.
(emerge-make-diff-list, emerge-make-diff3-list): Replace all calls to
`emerge-protect-metachars' with `shell-quote-argument' so that shell
quoting is done the same on all system types (Bug #6136).  Also shell
quote `emerge-diff-program' and `emerge-diff3-program'.

8 years agoFix 'dired-diff' when backup file is in another directory
Eli Zaretskii [Sat, 6 Aug 2016 10:13:57 +0000 (13:13 +0300)]
Fix 'dired-diff' when backup file is in another directory

* lisp/dired-aux.el (dired-diff): Clarify the doc string wrt how
the default for FILE is computed, especially when backup files
are involved.  Support backup files in another directory.
Don't suggest the default FILE if it doesn't exist.  (Bug#24089)

8 years agoFix the 'T' command in Dired with non_ASCII file names
Eli Zaretskii [Sat, 6 Aug 2016 09:44:38 +0000 (12:44 +0300)]
Fix the 'T' command in Dired with non_ASCII file names

* lisp/dired-aux.el (dired-do-chxxx): Bind coding-system-for-write
to correctly encode file names passed to the invoked PROGRAM.
(Bug#24162)

8 years ago* lisp/files.el (version-control): Drop :group vc (Bug #14687)
Noam Postavsky [Sat, 6 Aug 2016 00:04:17 +0000 (20:04 -0400)]
* lisp/files.el (version-control): Drop :group vc (Bug #14687)

8 years agoMerge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:10:30 +0000 (14:10 -0700)]
Merge from origin/emacs-25

d841a03 ; Spelling fix
a6ae479 Post AppDefined events from the main thread ONLY (bug#23934)
d35d398 Update to the AUTHORS file for Bob Weiner
4d2f4df Revert "Fix local printer set to left aligned string formatter."
cd1b4d6 Revert "Fix ses-delete-blanks to delete only blanks + documen...
f7ceb8e Revert "Fix English."
baa7abd Improve doc strings of 'gud-gdb' and 'gdb'
aa4271a Fix doc string of 'minibuffer-message-timeout'
b275cc7 Fix English.
3c97b0f Fix ses-delete-blanks to delete only blanks + documentation.
272391f profiler: document prefix arg for tree expansion
442cc39 Clarify usage of eshell-visual-options
b443c3c Fix comment in files-in-below-directory
8a38e94 Fix local printer set to left aligned string formatter.
0f0b191 ; Fix typos in NEWS
6bdf687 ; * etc/NEWS: Remove temporary marks

8 years ago; Merge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:10:30 +0000 (14:10 -0700)]
; Merge from origin/emacs-25

The following commit was skipped:

3d981dd Bump Emacs version to 25.1 for the first RC

8 years agoMerge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:10:30 +0000 (14:10 -0700)]
Merge from origin/emacs-25

d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...

# Conflicts:
# ChangeLog.2
# src/lisp.h

8 years ago; Merge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:09:09 +0000 (14:09 -0700)]
; Merge from origin/emacs-25

The following commits were skipped:

ff3fc21 Port to glibc 2.24 (pre-release) + ppc64
eb9d461 * lisp/net/shr.el (shr-fill-line): Withdraw the last commit (...
4157159 * lisp/net/shr.el (shr-fill-line): Preserve text properties i...

8 years agoMerge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:09:09 +0000 (14:09 -0700)]
Merge from origin/emacs-25

9a41cd1 ; Fix typo
9356fe2 Expand FIXME near definition of fboundp
219b39f kill-rectangle should mention killed-rectangle
59fa4c3 Avoid assertion violations in nhexl-mode

8 years ago; Merge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:09:09 +0000 (14:09 -0700)]
; Merge from origin/emacs-25

The following commit was skipped:

916abe9 Use memmove instead of memcpy on overlapping regions

8 years agoMerge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:09:08 +0000 (14:09 -0700)]
Merge from origin/emacs-25

9ba51ed Document buffer-swap-text+save-excursion interaction
452aa94 Fix eieio vs cl-generic incompatibilities found in Rudel (bug...
248d5dd Include cl-generic in package--builtin-versions (bug#22817)
8f5a8b6 Improve timing in `tramp-test29-environment-variables'
05ba7a0 Add test for handling environment variables in Tramp
e393d4f * lisp/emacs-lisp/package.el (describe-package-1) (package-st...
5e38887 ; * lisp/net/tramp.el: Fix 2010-10-04 comment typo.  (Bug#23913)
90f2169 ; Spelling fixes
069fc05 Improve documentation of search functions
0a0144a Delete environment variables in Tramp when needed
f624671 Add "New in Emacs 25" section to the FAQ
658daf9 Fix 'vertical-motion' in non-interactive sessions
686b520 Fix memory leak in imagemagick-types
4069b71 Update ELisp manual to match 'string-collate-equalp' doc string
1b2d6a6 Clarify docstring of find-feature-regexp
aac62a6 Add details to cl-lib defining macros' docstrings
d6aa4da Clarify doc string of 'save-buffer'
03bcf11 Un-confuse doc string of 'string-collate-equalp'
c53135b Clarify documentation of 'mouse-on-link-p'

# Conflicts:
# lisp/emacs-lisp/eieio-core.el

8 years ago; Merge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:07:01 +0000 (14:07 -0700)]
; Merge from origin/emacs-25

The following commit was skipped:

8f9c1ed Fix missing undo-boundary on revert-buffer.

8 years agoMerge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:07:01 +0000 (14:07 -0700)]
Merge from origin/emacs-25

6f285d9 Amend last addition to etc/PROBLEMS
7067890 * etc/PROBLEMS: Mention GTK+ problem with unexpected frame wi...

8 years ago; Merge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:07:01 +0000 (14:07 -0700)]
; Merge from origin/emacs-25

The following commit was skipped:

a5dcc97 Fix open-network-stream responsiveness

8 years agoMerge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:07:00 +0000 (14:07 -0700)]
Merge from origin/emacs-25

d4c6774 Fix missing point information in undo
3a9d629 Avoid crashes when buffer modification hooks clobber match data
178b2f5 Note combine-and-quote-strings doesn't shell quote
dec7567 Explain when package-initialize isn't called
113d1e2 Fix escaping in sh-indent-after-continuation docstr
80e2044 ; * etc/NEWS: Improve previous change.
5bb9e6c ; * etc/NEWS: Document how to avoid horizontal scroll bars.
38f4b8e Clarify the documentation of back-references in replacements

8 years ago; Merge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:07:00 +0000 (14:07 -0700)]
; Merge from origin/emacs-25

The following commit was skipped:

d039fc4 ; Auto-commit of loaddefs files.

8 years agoMerge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:06:59 +0000 (14:06 -0700)]
Merge from origin/emacs-25

850ba44 Clarify lexical binding with symbol args behavior
f981b31 * lisp/net/tramp-sh.el (tramp-remote-path): Doc fix.
68fc964 * lisp/net/tramp-sh.el (tramp-remote-path): Doc fix.  (Bug#23...
21110af Avoid assertion violations when rendering some fonts
6192b6c Document more details of package activation
272ddc6 Fixup warning message regarding HOME a bit more
43206d6 * lisp/leim/quail/indian.el ("bengali-probhat"): Change indic...
d41f7ff Fix input method "probhat" for Bengali
c150a64 ; Fix typo in commit before last
ebf0472 Add to elisp-completion-at-point's docstring
fd9fad0 Give more helpful warning about setting HOME
ea6b01d ; * lisp/term.el (term-mode): FIXME comment about bidi reorde...

# Conflicts:
# lisp/term.el

8 years ago; Merge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:05:10 +0000 (14:05 -0700)]
; Merge from origin/emacs-25

The following commit was skipped:

7f83e7e Fix slow redisplay in term-mode

8 years agoMerge from origin/emacs-25
Paul Eggert [Fri, 5 Aug 2016 21:05:09 +0000 (14:05 -0700)]
Merge from origin/emacs-25

26d4da0 New input method "probhat" for Bengali
4f445bf ; Spelling fix
f403f03 ; Fix typo

8 years agoSpelling and minor grammar fixes
Paul Eggert [Fri, 5 Aug 2016 20:31:10 +0000 (13:31 -0700)]
Spelling and minor grammar fixes

* test/file-organization.org: Rename from test/file-organisation.org.

8 years agoWiden in certain low level CC Mode functions. This fixes bug #24148.
Alan Mackenzie [Thu, 4 Aug 2016 21:07:52 +0000 (21:07 +0000)]
Widen in certain low level CC Mode functions.  This fixes bug #24148.

* lisp/progmodes/cc-engine (c-state-semi-pp-to-literal)
(c-state-full-pp-to-literal): Widen around the functionality.
(c-parse-ps-state-below): Correct the order of save-excursion and
save-restriction.

8 years agoFix Bug#24149
Stefan Monnier [Thu, 4 Aug 2016 15:39:28 +0000 (23:39 +0800)]
Fix Bug#24149

* lisp/subr.el (set-transient-map): Don't wait if MAP not present in
overriding-terminal-local-map.  (Bug#24149)

8 years agoUpdate from gnulib
Paul Eggert [Wed, 3 Aug 2016 22:10:58 +0000 (15:10 -0700)]
Update from gnulib

This incorporates:
2016-07-03 mktime: call tzset as per POSIX
* doc/misc/texinfo.tex, lib/mktime.c, m4/mktime.m4:
Copy from gnulib.

8 years ago; Spelling fix
Paul Eggert [Wed, 3 Aug 2016 21:58:30 +0000 (14:58 -0700)]
; Spelling fix

8 years agoFix GnuTLS includes
Paul Eggert [Wed, 3 Aug 2016 21:20:38 +0000 (14:20 -0700)]
Fix GnuTLS includes

* src/gnutls.c [HAVE_GNUTLS]: Don’t include gnutls/gnutls.h
a second time; although it doesn’t hurt, it’s not needed.
* src/sysdep.c [!HAVE_GNUTLS]: Don’t include gnutls/crypto.h,
as it may not be available.  Problem reported by Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00100.html

8 years agoPost AppDefined events from the main thread ONLY (bug#23934)
Alan Third [Wed, 20 Jul 2016 20:59:17 +0000 (21:59 +0100)]
Post AppDefined events from the main thread ONLY (bug#23934)

* src/nsterm.h: Make nextappdefined var not just GNUStep.
* src/nsterm.c (ns_send_appdefined, sendFromMainThread): Remove GNUStep

8 years agoFix accessing regex-resources in out-of-tree test runs in regex-tests
Michal Nazarewicz [Wed, 3 Aug 2016 02:37:29 +0000 (04:37 +0200)]
Fix accessing regex-resources in out-of-tree test runs in regex-tests

[82a487d: Fix reading of regex-resources in regex-tests] attempted to
fix regex-tests failing when run from the source tree (i.e. via make)
by hard-coding path to regex-resources directory relative to the test
directory.

This fixed runs from the tree but broke the test when run using other
methods.

Fix by trying ‘load-file-name’ or ‘buffer-file-name’, whichever is set.

* test/src/regex-tests.el (regex-tests--resources-dir): New variable
storing path to the regex-resources directory.
(regex-tests-generic-line): Use aforementioned variable.

8 years agoSimplify by assuming GnuTLS 2.12.2 or later
Paul Eggert [Wed, 3 Aug 2016 12:02:03 +0000 (08:02 -0400)]
Simplify by assuming GnuTLS 2.12.2 or later

* src/gnutls.c (gnutls_certificate_details):
* src/sysdep.c: Assume GnuTLS 2.12.2 or later.

8 years agoPort to systems lacking GNUTLS_NONBLOCK
Paul Eggert [Wed, 3 Aug 2016 11:45:47 +0000 (07:45 -0400)]
Port to systems lacking GNUTLS_NONBLOCK

Problem reported by Colin Baxter in:
http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00096.html
* src/gnutls.c (Fgnutls_boot): Don’t assume GNUTLS_NONBLOCK is defined.