summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge from origin/emacs-26Glenn Morris2018-02-0519-101/+181
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c787a49 (origin/emacs-26) * lisp/vc/vc-git.el (vc-git-print-log): Res... b654791 * doc/emacs/misc.texi (Interactive Shell): Refer to node "Min... f1102d2 Yet another round of fixing the Emacs manual 76b5a68 * etc/NEWS: Expunge the solecism "allow(s)" + infinitive b4ff8cc Two minor fixes in Antinews aafcd12 * etc/NEWS: Rename image-dired-thumb-job-limit a893924 * lisp/simple.el (async-shell-command, shell-command): Fix gr... 699081f Fix deferred display of async shell-command buffers d2d5e54 Mention remote file name completion in Emacs manual f589f5a Yest another round of manual copyedits 1ed4089 Update xdisp.c commentary e23de39 Fix Bug#30324 e1a9dc0 Recognize Org as builtin package (bug#30310) Conflicts: etc/NEWS
| * * lisp/vc/vc-git.el (vc-git-print-log): Restrict file scope to a single fileJuri Linkov2018-02-042-3/+8
| | | | | | | | | | | | | | when vc-git-print-log-follow is non-nil (bug#19045). (vc-git-print-log-follow): Doc fix. * etc/NEWS: Mention 'vc-git-print-log-follow'.
| * * doc/emacs/misc.texi (Interactive Shell): Refer to node "Minibuffer File"Michael Albinus2018-02-041-1/+2
| | | | | | | | for hints how to type remote file names effectively.
| * Yet another round of fixing the Emacs manualEli Zaretskii2018-02-048-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/emacs/cmdargs.texi (Action Arguments): Rearrange text describing what happens when Emacs is invoked with several file arguments. Suggested by Grant Rettke <gcr@wisdomandwonder.com> in emacs-manual-bugs@gnu.org. * doc/emacs/xresources.texi (GTK styles): * doc/emacs/mini.texi (Passwords): * doc/emacs/frames.texi (Scroll Bars): Use "cannot" instead of "can not". * doc/emacs/macos.texi (Mac / GNUstep Basics): Clarify the effect of ns-right-alternate-modifier when its value is 'none'. Suggested by Wanderson Ferreira <iagwanderson@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/calendar.texi (Importing Diary, Appointments): Now sub-sections of Diary. * doc/emacs/emacs.texi (Top): * doc/emacs/calendar.texi (Diary): Adjust menus to the above change. Suggested by Isaac Carter <icarter1391@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/anti.texi (Antinews): Fix grammar.
| * * etc/NEWS: Expunge the solecism "allow(s)" + infinitiveAlan Mackenzie2018-02-041-16/+18
| |
| * Two minor fixes in AntinewsMartin Rudalics2018-02-041-2/+2
| | | | | | | | * doc/emacs/anti.texi (Antinews): Two minor fixes.
| * * etc/NEWS: Rename image-dired-thumb-job-limitJuri Linkov2018-02-031-1/+1
| | | | | | | | to image-dired-queue-active-limit (bug#30279)
| * * lisp/simple.el (async-shell-command, shell-command): Fix grammarBasil L. Contovounesios2018-02-031-6/+6
| |
| * Fix deferred display of async shell-command buffersBasil L. Contovounesios2018-02-031-7/+13
| | | | | | | | | | | | * lisp/simple.el (shell-command): Display async shell buffer on process output for every, not just first, command invocation. Check buffer liveness, not name, before displaying. (bug#30213, bug#30280)
| * Mention remote file name completion in Emacs manualEli Zaretskii2018-02-031-0/+6
| | | | | | | | | | * doc/emacs/mini.texi (Minibuffer File): Describe the behavior of "//" with remote file names. (Bug#29149)
| * Yest another round of manual copyeditsEli Zaretskii2018-02-034-29/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/emacs/fixit.texi (Transpose, Spelling): Minor stylistic changes. Suggested by myq larson <myqlarson@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/calendar.texi (Appointments, Time Intervals): Mention relevant Org features. Suggested by Alex Branham <alex.branham@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/dired.texi (Operating on Files) (Shell Commands in Dired, Image-Dired): Minor stylistic edits. Suggested by Francis Wright <f.j.wright@live.co.uk> in emacs-manual-bugs@gnu.org. * doc/emacs/commands.texi (User Input): Explain "C-M-a". Suggested by Martin Luethi <martin.luethi@geo.uzh.ch> in emacs-manual-bugs@gnu.org.
| * Update xdisp.c commentaryEli Zaretskii2018-02-031-14/+29
| | | | | | | | | | * src/xdisp.c: Update commentary regarding "asynchronous" entry into redisplay. (Bug#30182)
| * Fix Bug#30324Michael Albinus2018-02-031-2/+2
| | | | | | | | | | * lisp/net/rlogin.el (rlogin, rlogin-directory-tracking-mode): Adapt to changed remote file name syntax. (Bug#30324)
| * Recognize Org as builtin package (bug#30310)Glenn Morris2018-02-022-0/+32
| | | | | | | | | | * lisp/org/org.el: Add Version header so detected as builtin package. * test/lisp/org/org-tests.el: New file.
* | Fix inconsistency expanding "//" in TrampMichael Albinus2018-02-053-21/+43
| | | | | | | | | | | | | | | | | | | | | | * doc/misc/tramp.texi (File name completion): Adapt example expanding "//". * lisp/net/tramp.el (tramp-handle-substitute-in-file-name): "//" shall expand the localname only, even when on top of the local part. * test/lisp/net/tramp-tests.el (tramp-test04-substitute-in-file-name): Adapt test.
* | Fix handling of modifier keys on macOSPhilipp Stephani2018-02-043-122/+63
| | | | | | | | | | | | | | | | | | | | | | | | * src/nsterm.m (keyDown:): Distinguish between shift-like and control-like modifier keys. Allow treating ⌘ as shift-like modifier (e.g. for the Gujarati – QUERTY input method, where ⌘ switches to QUERTY.) * lisp/cus-start.el (standard): Change nil to none for ns-command-modifier; update description. * etc/NEWS: Add NEWS entry.
* | Make tramp-archive fit for older EmacsenMichael Albinus2018-02-043-39/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/net/tramp-archive.el (tramp-archive-enabled) (tramp-archive-file-name-handler-alist) (tramp-archive-file-name-handler): Adapt docstring. (tramp-register-archive-file-name-handler): Remove it from `after-init-hook' when unloading. (tramp-archive-gvfs-host): New defsubst. (tramp-archive-dissect-file-name): Use it. * lisp/net/tramp-cmds.el (tramp-cleanup-all-connections): Check that `tramp-archive-enabled' is bound. * test/lisp/net/tramp-archive-tests.el (tramp-archive-test42-auto-load): Check also that tramp-archive is not loaded when Tramp is loaded. (tramp-archive-test42-delay-load): Adapt test messages.
* | Avoid EOVERFLOW problems with file-directory-pPaul Eggert2018-02-033-11/+39
| | | | | | | | | | | | | | | | | | | | This fixes a bug where (file-directory-p FOO) would fail if FOO had an inode number out of range for ‘stat’. * src/fileio.c (file_directory_p): Accept a Lisp string instead of a C string. All callers changed. On non-MS-Windows hosts, use openat with O_PATH|O_DIRECTORY if available, otherwise file_accessible_directory_p unless it fails due to EACCESS, otherwise stat.
* | Add tests to verify error propagation in 'json-insert'.Philipp Stephani2018-02-031-0/+32
| | | | | | | | | | * test/src/json-tests.el (json-tests--error): New error symbol. (json-insert/signal, json-insert/throw): New tests.
* | Don't require all file-attributes to be equal (Bug#30327)Noam Postavsky2018-02-031-3/+17
| | | | | | | | | | | | | | | | * test/lisp/files-tests.el (files-tests-file-attributes-equal): New function. (files-tests-file-name-non-special-directory-files-and-attributes) (files-tests-file-name-non-special-file-attributes): Use it instead of `equal'.
* | * test/lisp/files-tests.el (files-tests--with-temp-non-special):Michael Albinus2018-02-031-1/+2
| | | | | | | | | | Expand `temporary-file-directory' by `file-truename', in case it is located on a symlinked directory. (Bug#30327)
* | Prevent loading tramp-archive when it cannot be usedMichael Albinus2018-02-034-55/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | ; Fix arglist doc of json parse functionsBasil L. Contovounesios2018-02-031-2/+2
| | | | | | | | | | * src/json.c (Fjson_parse_string, Fjson_parse_buffer): Fix "usage:" arglist doc.
* | Autoload tramp-archiveMichael Albinus2018-02-033-14/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | ; * autogen.sh (check_version): Improve previous change.Glenn Morris2018-02-021-1/+1
| |
* | Try to work around intermittent autogen failure on hydra.nixos.orgGlenn Morris2018-02-021-1/+8
| | | | | | | | | | * autogen.sh (check_version): Try to handle odd systems where /bin/sh does not define the "command" builtin.
* | ; * autogen.sh: Remove temporary debug statements.Glenn Morris2018-02-021-6/+0
| |
* | ; * autogen.sh: Add some temporary debug statements.Glenn Morris2018-02-021-0/+6
| |
* | ; * autogen.sh: Remove temporary debug statements.Glenn Morris2018-02-021-7/+0
| |
* | ; * autogen.sh: Add some temporary debug statements.Glenn Morris2018-02-021-0/+7
| |
* | * autogen.sh: Remove temporary debug statements.Glenn Morris2018-02-021-9/+0
| |
* | * autogen.sh: Add some temporary debug statements, for hydra.nixos.org.Glenn Morris2018-02-021-0/+9
| |
* | ; Merge from emacs-26Noam Postavsky2018-02-022-27/+17
|\ \ | |/ | | | | | | 4c8157cfe0 ; Let files-tests.el pass multiple times in a session 99251ab62e ; Avoid process kill query during term tests
| * ; Let files-tests.el pass multiple times in a sessionNoam Postavsky2018-02-021-12/+10
| | | | | | | | | | | | * 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.
| * ; Avoid process kill query during term testsNoam Postavsky2018-02-021-15/+7
| | | | | | | | | | | | * 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).
* | CC Mode: Fix an enum intro being parsed as defun-block-introAlan Mackenzie2018-02-022-12/+9
| | | | | | | | | | | | | | | | | | | | | | * 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.
* | Properly integrate modules into the loading process (Bug#30164).Philipp Stephani2018-02-023-28/+77
| | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Use 'defalias' in test module instead of 'fset'.Philipp Stephani2018-02-022-4/+5
| | | | | | | | | | | | | | | | | | | | 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.
* | Add support for module functions to C-h f (Bug#30163).Philipp Stephani2018-02-022-0/+16
| | | | | | | | | | | | | | | | * lisp/help-fns.el (help-fns-function-description-header): Handle module functions. * test/src/emacs-module-tests.el (module/describe-function-1): New test.
* | Handle quoted remote file names for file notificationsMichael Albinus2018-02-023-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Minor tweaks in tramp-archive.elMichael Albinus2018-02-021-2/+7
| | | | | | | | | | | | * 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.
* | Merge from origin/emacs-26Glenn Morris2018-02-0216-61/+76
|\ \ | |/ | | | | | | | | | | | | | | | | 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.
| * Another round of manual fixupsEli Zaretskii2018-02-029-45/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * * doc/lispref/customize.texi (Custom Themes): Clarify .el preference.Basil L. Contovounesios2018-02-021-1/+3
| | | | | | | | | | | | Copyright-paperwork-exempt: yes https://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00824.html.
| * * doc/emacs/entering.texi (Entering Emacs): Another wording fix.Eli Zaretskii2018-02-021-5/+5
| |
| * * doc/lispref/functions.texi (Inline Functions): Fix typo (Bug#30238).Noam Postavsky2018-02-011-1/+1
| |
| * * lisp/imenu.el (imenu-generic-expression): Rephrase doc (Bug#30294).Noam Postavsky2018-02-011-2/+2
| |
| * Fix last change of @key markupEli Zaretskii2018-02-015-7/+7
| | | | | | | | | | | | | | | | | | * 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.
| * * doc/emacs/entering.texi (Entering Emacs): Fix markup.Eli Zaretskii2018-02-011-2/+2
| |
* | ; Merge from origin/emacs-26Glenn Morris2018-02-020-0/+0
|\ \ | |/ | | | | | | | | | | The following commits were skipped: 01932c8 Revert a1bbc49015 (Bug#30243), do not merge 855ae57 ; Auto-commit of loaddefs files.
View Lorry Controller Status