1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-26 23:20:29 -08:00
Commit graph

132036 commits

Author SHA1 Message Date
Michael Albinus
a2cb52cd2e Prevent loading tramp-archive when it cannot be used
* lisp/files.el (locate-dominating-file): Check, that FILE is
a directory when traversing the tree.

* lisp/net/tramp-archive.el (tramp-archive-enabled): New defvar.
(tramp-archive-file-name-regexp): Protect against errors.
(tramp-archive-file-name-handler)
(tramp-register-archive-file-name-handler): Use it.
(all) Call `tramp-register-archive-file-name-handler'.

* lisp/net/tramp.el (tramp-register-file-name-handlers):
Use `tramp-archive-enabled'.

* test/lisp/net/tramp-archive-tests.el (all):
Use `tramp-archive-enabled' instead of `tramp-gvfs-enabled'.
(tramp-archive--test-emacs27-p): New defun.
(tramp-archive-test42-auto-load): Skip for older Emacsen.
(tramp-archive-test42-delay-load): Skip for older Emacsen.
Test also behavior when `tramp-archive-enabled' is nil.
2018-02-03 18:49:56 +01:00
Basil L. Contovounesios
f7c8a12b12 ; Fix arglist doc of json parse functions
* src/json.c (Fjson_parse_string, Fjson_parse_buffer):
Fix "usage:" arglist doc.
2018-02-03 15:17:10 +01:00
Michael Albinus
84c9dba4ce Autoload tramp-archive
* doc/misc/tramp.texi (Archive file names): Do not require to
load Tramp explicitly, this is autoloaded now also for file archives.

* lisp/net/tramp-archive.el (tramp-archive-suffixes)
(tramp-archive-compression-suffixes): Autoload them.
(tramp-archive-autoload-file-name-regexp): New defmacro.
(tramp-archive-file-name-regexp): Use it.
(tramp-register-archive-file-name-handler): New defun.  Call
it in `after-init-hook'.

* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-file-system-info): Rename from
`tramp-archive-test40-archive-file-system-info.
(tramp-archive-test42-auto-load)
(tramp-archive-test42-delay-load): New tests.
2018-02-03 13:22:56 +01:00
Glenn Morris
0e0ad865d4 ; * autogen.sh (check_version): Improve previous change. 2018-02-02 20:58:34 -05:00
Glenn Morris
c532a8015e Try to work around intermittent autogen failure on hydra.nixos.org
* autogen.sh (check_version): Try to handle odd systems where
/bin/sh does not define the "command" builtin.
2018-02-02 20:42:08 -05:00
Glenn Morris
83fc9009c6 ; * autogen.sh: Remove temporary debug statements. 2018-02-02 19:46:17 -05:00
Glenn Morris
8298cb41fe ; * autogen.sh: Add some temporary debug statements. 2018-02-02 19:45:24 -05:00
Glenn Morris
1360df13af ; * autogen.sh: Remove temporary debug statements. 2018-02-02 19:11:52 -05:00
Glenn Morris
028087d903 ; * autogen.sh: Add some temporary debug statements. 2018-02-02 19:09:49 -05:00
Glenn Morris
396ed68739 * autogen.sh: Remove temporary debug statements. 2018-02-02 18:45:42 -05:00
Glenn Morris
b70321ea85 * autogen.sh: Add some temporary debug statements, for hydra.nixos.org. 2018-02-02 18:44:36 -05:00
Noam Postavsky
2b288eb900 ; Merge from emacs-26
4c8157cfe0 ; Let files-tests.el pass multiple times in a session
99251ab62e ; Avoid process kill query during term tests
2018-02-02 18:12:37 -05:00
Noam Postavsky
4c8157cfe0 ; Let files-tests.el pass multiple times in a session
* test/lisp/files-tests.el (files-test-local-variables): Use `cl-letf'
instead of advice.  The advice was not being activated on the second
run.
2018-02-02 18:09:13 -05:00
Noam Postavsky
99251ab62e ; Avoid process kill query during term tests
* test/lisp/term-tests.el (term-test-screen-from-input): Just unset
the process query-on-exit flag to rather than trying to end the
process before the end of test (which is generally unreliable).
2018-02-02 18:08:50 -05:00
Alan Mackenzie
d3090a3a3e CC Mode: Fix an enum intro being parsed as defun-block-intro
* lisp/progmodes/cc-engine.el (c-inside-bracelist-p): Return a bufpos rather
than t for the enum case.
(c-add-stmt-syntax, c-guess-continued-construct): Replace
c-looking-at-or-maybe-in-bracelist by c-inside-bracelist-p, since the former
does not recognize enum brace lists, but the latter does.

* lisp/progmodes/cc-fonts.el (c-get-fontification-context): Replace
c-looking-at-or-maybe-in-bracelist by c-inside-bracelist-p.
2018-02-02 20:46:35 +00:00
Philipp Stephani
0443411f5c Properly integrate modules into the loading process (Bug#30164).
* src/lread.c (Fload): Don't defer to module-load immediately when
encountering a module, but use the normal loading machinery to
properly set up load-history, check for recursive loads, print
messages, etc.

* test/src/emacs-module-tests.el (module/load-history): New test.
(module/describe-function-1): Adapt test.

* etc/NEWS: Mention fixed behavior.
2018-02-02 20:56:01 +01:00
Philipp Stephani
75c663f834 Use 'defalias' in test module instead of 'fset'.
This puts functions defined in the module into the 'load-history'.

* test/data/emacs-module/mod-test.c (bind_function): Use 'defalias'
instead of 'fset'.

* test/src/emacs-module-tests.el (module/describe-function-1): Adapt
unit test.
2018-02-02 20:40:10 +01:00
Philipp Stephani
f3d0db7f0f Add support for module functions to C-h f (Bug#30163).
* lisp/help-fns.el (help-fns-function-description-header): Handle
module functions.

* test/src/emacs-module-tests.el (module/describe-function-1): New
test.
2018-02-02 20:31:40 +01:00
Michael Albinus
344750aef4 Handle quoted remote file names for file notifications
* lisp/filenotify.el (file-notify-add-watch): Do not suppress
other file name handlers when FILE is quoted.

* test/lisp/filenotify-tests.el
(file-notify-test-remote-temporary-file-directory):
Beware quoted `temporary-file-directory'.

* test/lisp/files-tests.el
(files-tests-file-name-non-special-quote-unquote): Improve test.
2018-02-02 18:51:25 +01:00
Michael Albinus
b86b8ee072 Minor tweaks in tramp-archive.el
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler):
Bind `tramp-unknown-id-integer' and `tramp-unknown-id-string'
in order to have minimal ownership information.
2018-02-02 17:06:22 +01:00
Glenn Morris
a893a4db20 Merge from origin/emacs-26
6f495ab (origin/emacs-26) Another round of manual fixups
59344c4 * doc/lispref/customize.texi (Custom Themes): Clarify .el pre...
6386efc * doc/emacs/entering.texi (Entering Emacs): Another wording fix.
e21f018 * doc/lispref/functions.texi (Inline Functions): Fix typo (Bu...
1c2fb04 * lisp/imenu.el (imenu-generic-expression): Rephrase doc (Bug...
b90e91c Fix last change of @key markup
f180075 * doc/emacs/entering.texi (Entering Emacs): Fix markup.
2018-02-02 07:50:22 -08:00
Glenn Morris
8dd2edc70f ; Merge from origin/emacs-26
The following commits were skipped:

01932c8 Revert a1bbc49015 (Bug#30243), do not merge
855ae57 ; Auto-commit of loaddefs files.
2018-02-02 07:50:22 -08:00
Glenn Morris
c4f8b5545e Merge from origin/emacs-26
56c37bb Use @key{} where it is missing in the manuals
25c0198 Another round of manual fixes from proofreading
2018-02-02 07:50:22 -08:00
Eli Zaretskii
6f495abd0d Another round of manual fixups
* doc/emacs/killing.texi (Killing by Lines): Clarify wording.
Reported by David Bonnafous <dbonnafo@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/windows.texi (Other Window): Improve wording.
Reported by Rasmus Sjostrom <ras.sjostrom@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/display.texi (Display Custom): Mention that line
numbers are not displayed in the minibuffer and tooltips.

* doc/emacs/mini.texi (Basic Minibuffer): Improve wording.
* doc/emacs/regs.texi (Registers): More comma removal.  Suggested
by "root@vxid.pw root@vxid.pw" <root@vxid.pw> in
emacs-manual-bugs@gnu.org.

* doc/emacs/display.texi (Auto Scrolling): Fix a typo.  Reported
by Kevin Foley <kfoley15@gmail.com> in emacs-manual-bugs@gnu.org.

* doc/emacs/display.texi (Scrolling): Fix grammar.
(Horizontal Scrolling): Mention reasonable limits for hscroll-step
float values.  Suggested by Jerome Truong <jerometruong@gmail.com>
in emacs-manual-bugs@gnu.org.

* doc/emacs/mini.texi (Minibuffer Edit): Add a missing comma.
* doc/emacs/basic.texi (Position Info, Arguments, Repeating):
Remove redundant commas.  Suggested by oldgaro
<oldgaro@protonmail.com> in emacs-manual-bugs@gnu.org.

* doc/emacs/kmacro.texi (Save Keyboard Macro): Clarify wording.
Suggested by clemens.radermacher@posteo.de in
emacs-manual-bugs@gnu.org.

* doc/emacs/building.texi (Compilation Mode): Improve and simplify
wording.  Suggested by drone <yoorobot@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/dired.texi (Dired Enter): Clarify wording.
(Dired Deletion): Fix a typo.
(Marks vs Flags): Mention that M-DEL in Dired asks for the mark
character.  Fix typos.
* doc/emacs/basic.texi (Moving Point, Erasing, Basic Undo)
(Arguments): Some additional information about keys.  Reported by
Francis Wright <f.j.wright@live.co.uk> in
emacs-manual-bugs@gnu.org.
2018-02-02 17:41:38 +02:00
Stefan Monnier
6ff8b7749f * lisp/emacs-lisp/cconv.el (cconv-convert): Fix compiling compiled code
Don't conv-convert the docstring arg of defvar/defconst.
2018-02-02 10:28:34 -05:00
Basil L. Contovounesios
59344c43a9 * doc/lispref/customize.texi (Custom Themes): Clarify .el preference.
Copyright-paperwork-exempt: yes

https://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00824.html.
2018-02-02 09:22:53 -05:00
Michael Albinus
ecc6257f48 Fix quoting in tramp-find-inline-compress for w32
* lisp/net/tramp-sh.el (tramp-find-inline-compress): Improve command
quoting for w32.  Reported by Chris Zheng <chriszheng99@gmail.com>.
2018-02-02 14:33:33 +01:00
Eli Zaretskii
6386efc8f7 * doc/emacs/entering.texi (Entering Emacs): Another wording fix. 2018-02-02 11:18:38 +02:00
Michael Albinus
e08de2bae2 Handle quoted file names in filenotify.el
* lisp/filenotify.el (file-notify-add-watch): Do not save
quoted file names in `file-notify-descriptors'.

* test/lisp/files-tests.el
(files-file-name-non-special-notify-handlers): Do not expect
to fail.
2018-02-01 20:15:12 -05:00
Michael Albinus
00c65bcf4e Use file-name-quote{,d-p} in files-tests.el
* test/lisp/files-tests.el
(files-tests-file-name-non-special-quote-unquote): New test.
(files-tests--file-name-non-special--subprocess): Simplify.
(files-tests--file-name-non-special--buffers)
(files-tests--with-temp-non-special)
(files-tests-file-name-non-special-directory-file-name)
(files-tests-file-name-non-special-file-in-directory-p)
(files-tests-file-name-non-special-file-name-all-completions)
(files-tests-file-name-non-special-file-name-as-directory)
(files-tests-file-name-non-special-file-name-completion)
(files-tests-file-name-non-special-file-name-directory)
(files-tests-file-name-non-special-find-backup-file-name)
(files-tests-file-name-non-special-make-nearby-temp-file):
Use `file-name-quote' and `file-name-quoted-p', respectively.
2018-02-01 20:15:11 -05:00
Noam Postavsky
65da409e41 Test and fix "/:" quoted file name handlers (Bug#30243)
Some w32 specific problems were discovered, but only worked around, as
these are not serious, and not the focus of this bug fix:
    - The w32 implementation of `insert-directory doesn't handle a nil
    SWITCHES argument.
    - `dired-compress-file' does not operate correctly if the unquoted
    filename contains a ":" (e.g., C:/foo/bar).

* lisp/files.el (file-name-non-special): Strip the "/:" from
`default-directory' for `temporary-file-directory' operation; both
arguments to `file-name-completion', `file-name-all-completion', and
`file-equal-p' operations; `buffer-file-name' for
`make-auto-save-file-name' and 'set-visited-file-modtime' operations.
Don't touch any operands of `file-notify-rm-watch' and
`file-notify-valid-p' as they receive descriptors; not file
names (this is not sufficient to fix these operations for "/:" quoted
file names though, these are fixed in a later commit).

* test/lisp/files-tests.el (files-tests--with-temp-file): Give it a
`debug' property.
(files-tests--with-temp-non-special): New helper macro.
(files-tests--file-name-non-special--subprocess): Simplify.
(files-tests-file-name-non-special-quote-unquote)
(files-file-name-non-special-notify-handlers)
(files-file-name-non-special-handlers)
(files-tests-file-name-non-special-access-file)
(files-tests-file-name-non-special-add-name-to-file)
(files-tests-file-name-non-special-byte-compiler-base-file-name)
(files-tests-file-name-non-special-copy-directory)
(files-tests-file-name-non-special-copy-file)
(files-tests-file-name-non-special-delete-directory)
(files-tests-file-name-non-special-delete-file)
(files-tests-file-name-non-special-diff-latest-backup-file)
(files-tests-file-name-non-special-directory-file-name)
(files-tests-file-name-non-special-directory-files)
(files-tests-file-name-non-special-directory-files-and-attributes)
(files-tests-file-name-non-special-dired-uncache)
(files-tests-file-name-non-special-dired-compress-handler)
(files-tests-file-name-non-special-expand-file-name)
(files-tests-file-name-non-special-file-accessible-directory-p)
(files-tests-file-name-non-special-file-acl)
(files-tests-file-name-non-special-file-attributes)
(files-tests-file-name-non-special-file-directory-p)
(files-tests-file-name-non-special-file-equal-p)
(files-tests-file-name-non-special-file-executable-p)
(files-tests-file-name-non-special-file-exists-p)
(files-tests-file-name-non-special-file-in-directory-p)
(files-tests-file-name-non-special-file-local-copy)
(files-tests-file-name-non-special-file-modes)
(files-tests-file-name-non-special-file-name-all-completions)
(files-tests-file-name-non-special-file-name-as-directory)
(files-tests-file-name-non-special-file-name-case-insensitive-p)
(files-tests-file-name-non-special-file-name-completion)
(files-tests-file-name-non-special-file-name-directory)
(files-tests-file-name-non-special-file-name-nondirectory)
(files-tests-file-name-non-special-file-name-sans-versions)
(files-tests-file-name-non-special-file-newer-than-file-p)
(files-tests-file-name-non-special-file-ownership-preserved-p)
(files-tests-file-name-non-special-file-readable-p)
(files-tests-file-name-non-special-file-regular-p)
(files-tests-file-name-non-special-file-remote-p)
(files-tests-file-name-non-special-file-selinux-context)
(files-tests-file-name-non-special-file-symlink-p)
(files-tests-file-name-non-special-file-truename)
(files-tests-file-name-non-special-file-writable-p)
(files-tests-file-name-non-special-find-backup-file-name)
(files-tests-file-name-non-special-get-file-buffer)
(files-tests-file-name-non-special-insert-directory)
(files-tests-file-name-non-special-insert-file-contents)
(files-tests-file-name-non-special-load)
(files-tests-file-name-non-special-make-auto-save-file-name)
(files-tests-file-name-non-special-make-directory)
(files-tests-file-name-non-special-make-directory-internal)
(files-tests-file-name-non-special-make-nearby-temp-file)
(files-tests-file-name-non-special-make-symbolic-link)
(files-tests-file-name-non-special-rename-file)
(files-tests-file-name-non-special-set-file-acl)
(files-tests-file-name-non-special-set-file-modes)
(files-tests-file-name-non-special-set-file-selinux-context)
(files-tests-file-name-non-special-set-file-times)
(files-tests-file-name-non-special-set-visited-file-modtime)
(files-tests-file-name-non-special-shell-command)
(files-tests-file-name-non-special-start-file-process)
(files-tests-file-name-non-special-substitute-in-file-name)
(files-tests-file-name-non-special-temporary-file-directory)
(files-tests-file-name-non-special-unhandled-file-name-directory)
(files-tests-file-name-non-special-vc-registered)
(files-tests-file-name-non-special-write-region): New tests.
2018-02-01 20:14:57 -05:00
Noam Postavsky
e21f0189f3 * doc/lispref/functions.texi (Inline Functions): Fix typo (Bug#30238). 2018-02-01 19:26:40 -05:00
Noam Postavsky
1c2fb04bee * lisp/imenu.el (imenu-generic-expression): Rephrase doc (Bug#30294). 2018-02-01 19:26:40 -05:00
Eli Zaretskii
b90e91ca54 Fix last change of @key markup
* doc/lispref/display.texi (Specified Space):
* doc/emacs/programs.texi (C Modes):
* doc/emacs/killing.texi (Rectangles):
* doc/emacs/emacs.texi (Top):
* doc/emacs/display.texi (Useless Whitespace): Don't use @key
markup for characters and commands, only for keys.
2018-02-01 19:56:51 +02:00
Eli Zaretskii
f180075f15 * doc/emacs/entering.texi (Entering Emacs): Fix markup. 2018-02-01 19:49:18 +02:00
Paul Eggert
100e33979b Update from gnulib
This includes:
2018-01-31 environ: Fix link error on 64-bit Cygwin
2018-01-27 Fix malfunction of socket functions on HP-UX in 64-bit mode
2018-01-26 manywarnings: fix maintainer comment
2018-01-23 Merge strftime.c changes from glibc
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/gnulib.mk.in, lib/nstrftime.c, lib/unistd.in.h, m4/extensions.m4:
* m4/manywarnings.m4: Update.
2018-02-01 09:21:39 -08:00
Paul Eggert
c85d9e401a * src/xfns.c: Make some non-exported vars static. 2018-02-01 09:11:25 -08:00
Michael Albinus
b2127c631e Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2018-02-01 15:50:10 +01:00
Michael Albinus
ccd4e4796c Adapt tramp-tests.el according to Bug#30243
* test/lisp/net/tramp-tests.el (tramp--test-emacs27-p): New defun.
(tramp-test11-copy-file, tramp-test12-rename-file)
(tramp-test21-file-links, tramp-test24-file-acl)
(tramp-test25-file-selinux, tramp--test-check-files): Use it.
2018-02-01 15:49:18 +01:00
Michael Albinus
01932c8dec Revert a1bbc49015 (Bug#30243), do not merge
* lisp/files.el:
* test/lisp/net/tramp-tests.el: Revert a1bbc49015.  (Bug#30243)
2018-02-01 15:00:18 +01:00
Glenn Morris
7a20e0e1ef ; Auto-commit of loaddefs files. 2018-02-01 07:27:10 -05:00
Glenn Morris
855ae578ab ; Auto-commit of loaddefs files. 2018-02-01 06:27:00 -05:00
Michael Albinus
d42bd3a512 * lisp/files.el (get-free-disk-space): Wrap body with `save-match-data'.
Several `*-insert-directory' functions could fail otherwise.
2018-02-01 08:53:08 +01:00
Michael Albinus
f692deb7dd * lisp/net/tramp-archive.el (tramp-archive-run-real-handler): New defun.
(tramp-archive-file-name-handler): Use it.
2018-02-01 08:40:46 +01:00
Glenn Morris
1a04d95266 automerge: adjust meaning of -d option
* admin/automerge (nocd): New variable, replacing $dir.
(usage, -d): Option -d no longer takes an argument.
2018-01-31 16:15:16 -05:00
Glenn Morris
113963a89d automerge: add option to work in specific directory
* admin/automerge (usage): Mention -d.
(dir): New variable.
(-d): New option.
(main): If requested, cd to specified directory.
2018-01-31 15:05:14 -05:00
Michael Albinus
56c37bbdb6 Use @key{} where it is missing in the manuals 2018-01-31 19:59:12 +01:00
Glenn Morris
aac3ba4d43 automerge: add option to start with a reset
* admin/automerge (usage): Mention -r.
(reset): New variable.
(-r): New option.
(main): If requested, do a reset and pull.
2018-01-31 12:54:26 -05:00
Eli Zaretskii
25c01983af Another round of manual fixes from proofreading
* doc/emacs/search.texi (Incremental Search)
(Nonincremental Search): Mention the menu bar and fix typos.
Reported by David Bonnafous <dbonnafo@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/building.texi (Compilation): Improve wording.
Suggested by drone <yoorobot@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/kmacro.texi (Basic Keyboard Macro): Clarify text.
Suggested by Robert Pluim <rpluim@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/display.texi (Highlight Interactively, Fringes):
Improve wording.  Suggested by Justin Heyes-Jones
<justinhj@gmail.com> in emacs-manual-bugs@gnu.org.
* doc/emacs/commands.texi (User Input, Commands): Add missing
commas.
* doc/emacs/screen.texi (Menu Bar): Mention keyboard keys to
navigate menus.  Suggested by oldgaro <oldgaro@protonmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/search.texi (Not Exiting Isearch): Fix a typo.
Reported by "Kocken, I.J. (Ilja)" <I.J.Kocken@uu.nl> in
emacs-manual-bugs@gnu.org.
* doc/emacs/basic.texi (Inserting Text): Mention one more label of
RET.  Suggested by Francis Wright <f.j.wright@live.co.uk> in
emacs-manual-bugs@gnu.org.
* doc/emacs/text.texi (Paragraphs): Clarify text.  Reported by
Marcin Borkowski <mbork@mbork.pl> in emacs-manual-bugs@gnu.org.
* doc/emacs/maintaining.texi (Introduction to VC)
(Why Version Control?, VCS Merging): Fix typos and section
capitalization.  Suggested by "R. P. Dillon"
<rpdillon@killring.org> in emacs-manual-bugs@gnu.org.
* doc/emacs/modes.texi (Major Modes, Choosing Modes): Fix typos.
Reported by clemens.radermacher@posteo.de in
emacs-manual-bugs@gnu.org.
2018-01-31 18:23:17 +02:00
Glenn Morris
4dbc1ef5e6 Merge from origin/emacs-26
22922c7 (origin/emacs-26) * doc/emacs/entering.texi (Entering Emacs):...
59657c4 Document 'window-at-side-p' in the Elisp manual
2b35ed0 Document external-debugging-output in the Elisp Manual (Bug#2...
db6564c Fix scroll-margin docstring (Bug#13791)
732d1b9 Clarify that `ansi-term' is almost the same as `term' (Bug#18...
f706c59 Update manual description of locate-file (Bug#23650)
1602262 Clarify effect of print-gensym (Bug#27776)
53e9fa2 * lisp/custom.el (defcustom): Fix docstring (Bug#27891).
607cc4e Define cl-type-definition button type as needed (Bug#28899)
9e6889c Emphasize that GPG passphrase caching is temporary (Bug#29907)
4b5711b Fix @examples in cc-mode.info, where lines were getting glued...
71961f1 Minor change in "Mode Line" section of Emacs manual
55a2b76 More fixes in the Emacs manual
2018-01-31 07:50:23 -08:00