summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into scratch/replace-region-contentsscratch/replace-region-contentsTassilo Horn2019-02-2037-226/+592
|\
| * Fix missing interactive specTassilo Horn2019-02-201-1/+1
| | | | | | | | | | * lisp/json.el (json-pretty-print-buffer-ordered): Add interactive spec "P" which has been missing.
| * Improve connection hand-shaking in tramp-adb.elMichael Albinus2019-02-201-1/+4
| | | | | | | | | | * lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection): Send an additional RET.
| * * lisp/progmodes/sql.el (sql-is-indent-available): RemoveStefan Monnier2019-02-201-18/+13
| | | | | | | | | | | | (sql-indent-enable): Check (fboundp 'sqlind-minor-mode) without wondering which file might provide it. (sql-read-connection): η-reduce 'car'.
| * Fix handling of MINIBUF argument in 'walk-window-tree'Martin Rudalics2019-02-201-15/+19
| | | | | | | | | | | | | | | | * lisp/window.el (walk-window-tree): Handle MINIBUF argument as advertised when FRAME is minibuffer-only. (window--resize-apply-p, window--sanitize-window-sizes) (delete-other-windows, split-window-sensibly): Call 'walk-window-tree' with suitable MINIBUF argument.
| * * lisp/progmodes/sql.el: Fix use of string-empty-p in recent change.Glenn Morris2019-02-191-0/+1
| |
| * Simplify easy-mmode-define-navigationCharles A. Roelli2019-02-191-3/+1
| | | | | | | | | | | | * lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): Simplify a one-argument call to "or" and use buffer-narrowed-p instead of checking that condition by hand.
| * Implement access-file in TrampMichael Albinus2019-02-1910-15/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist): * lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist): * lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): * lisp/net/tramp-rclone.el (tramp-rclone-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): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist): Add `access-file'. * lisp/net/tramp-archive.el (tramp-archive-handle-access-file): * lisp/net/tramp.el (tramp-handle-access-file): New defun. (tramp-condition-case-unless-debug): Add declaration. (tramp-handle-insert-directory): * lisp/net/tramp-sh.el (tramp-sh-handle-insert-directory): * lisp/net/tramp-smb.el (tramp-smb-handle-insert-directory): Check, whether directory is accessible. * test/lisp/net/tramp-archive-tests.el (tramp-archive-test17-insert-directory) (tramp-archive-test18-file-attributes): * test/lisp/net/tramp-tests.el (tramp-test17-insert-directory) (tramp-test18-file-attributes): Test error cases.
| * cycle-sort-function prevails in completion-all-sorted-completionsJoão Távora2019-02-191-9/+13
| | | | | | | | | | | | * lisp/minibuffer.el (completion-all-sorted-completions): If completion table has cycle-sort-function, that prevails over other sorting strategies.
| * switch-to-buffer's completion table uses its own sortingJoão Távora2019-02-191-1/+5
| | | | | | | | | | | | * src/minibuf.c (Finternal_complete_buffer): Add Qcycle_sort_function to completion table's metadata. (syms_of_minibuf): New symbol Qcycle_sort_function.
| * Merge branch 'wallet'Michael R. Mauger2019-02-183-16/+284
| |\
| | * * lisp/progmodes/sql.el: Added password wallet usingwalletMichael R. Mauger2019-02-183-16/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `auth-source' package. (sql-auth-source-search-wallet): New function. (sql-password-wallet): New variable. (sql-password-search-wallet-function): New variable. (sql-get-login): Handle password wallet search. (sql-product-interactive): Handle password function. * test/lisp/progmodes/sql-test.el: Test wallet changes. (sql-test-login-params): New test variable. (with-sql-test-connect-harness): New macro to wrap test configuration around calls to `sql-connect'. (sql-test-connect, sql-test-connect-password-func) (sql-test-connect-wallet-server-database) (sql-test-connect-wallet-database) (sql-test-connect-wallet-server): New ERT tests. * etc/NEWS: Updated SQL Mode descriptions.
| * | * lisp/mh-e/mh-acros.el (mh-defstruct): Minor simplificationStefan Monnier2019-02-181-5/+9
| | |
| * | * lisp/erc/erc.el (erc-version-string): Remove, unusedStefan Monnier2019-02-181-3/+0
| |/
| * * lisp/progmodes/sql.el defensive programmingMichael R. Mauger2019-02-181-5/+7
| | | | | | | | | | | | | | | | (sql-statement-regexp): if 'ansi' dialect is not defined, use "select" (sql-interactive-mode): establish process sentinel iff there is a process. Default values for :prompt-regexp and :prompt-length. (sql-product-interactive): only check process status iff there is a process.
| * * lisp/elec-pair.el: Do modify+undo more carefullyStefan Monnier2019-02-181-14/+19
| | | | | | | | | | (electric-pair-inhibit-if-helps-balance): Use the undo system instead of undoing by hand.
| * Speed up cl-list-lengthPaul Eggert2019-02-181-4/+4
| | | | | | | | | | * lisp/emacs-lisp/cl-extra.el (cl-list-length): Use ‘length’ to do the real work; this is simpler and uses a better algorithm.
| * Minor profiler improvementsPaul Eggert2019-02-181-32/+18
| | | | | | | | | | | | | | | | | | * src/profiler.c (evict_lower_half, record_backtrace) (setup_cpu_timer, cmpfn_profiler, hashfn_profiler): Assume C99. Use bool for boolean. (timer_getoverrun): Remove; simplify use to not need it. (Fprofiler_cpu_start): Any negative return from setup_cpu_timer fails. (Fprofiler_cpu_stop): Simplify initialization.
| * * lisp/emacs-lisp/cl-lib.el (cl-endp): Move to cl-seq.elStefan Monnier2019-02-182-7/+7
| | | | | | | | Use 'cl-check-type'.
| * Use 'timer_getoverrun' on Cygwin when possibleKen Brown2019-02-182-4/+5
| | | | | | | | | | | | | | | | * configure.ac: Add a check for the 'timer_getoverrun' function. * src/profiler.c [CYGWIN] : Define 'timer_getoverrun' as a macro only on versions of Cygwin where it is not already defined as a function.
| * * lisp/vc/smerge-mode.el (smerge-change-buffer-confirm): New varStefan Monnier2019-02-183-48/+55
| | | | | | | | | | | | | | | | | | | | | | (smerge-vc-next-conflict): Obey it. Save buffer before going to the next. Don't emit message when vc-find-conflicted-file can't find other conflicted file. * lisp/vc/vc-hooks.el: Use lexical-binding. * lisp/vc/vc.el: Remove redundant :groups. (vc-find-conflicted-file): Autoload.
| * * lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New commandKonstantin Kharlamov2019-02-181-0/+14
| | | | | | | | Copyright-paperwork-exempt: yes
| * Increase timeout on emba for TrampMichael Albinus2019-02-181-1/+2
| | | | | | | | | | | | * test/lisp/net/tramp-tests.el (tramp--test-shell-command-to-string-asynchronously): Increase timeout on emba.
| * * src/fns.c: Fix comment.Paul Eggert2019-02-181-2/+1
| |
| * emacs-init-time outputs more digits nowPaul Eggert2019-02-171-1/+1
| | | | | | | | | | | | * lisp/time.el (emacs-init-time): Output more digits; formerly this was always outputting "0.0 seconds" for me because the number of seconds was less than 0.1.
| * * lisp/emacs-lisp/cl-lib.el (cl-endp): Remove stray 'x.Paul Eggert2019-02-171-1/+1
| |
| * * lisp/tar-mode.el (tar--try-jka-compr): Remove. (Bug#34251)Juri Linkov2019-02-172-22/+3
| | | | | | | | | | | | | | (tar-extract): Call archive-try-jka-compr instead of tar--try-jka-compr. * lisp/arc-mode.el (archive-try-jka-compr): Call set-buffer-multibyte after erase-buffer.
| * Fontify C function identifiers in parentheses correctly (e.g. in lisp.h)Alan Mackenzie2019-02-173-12/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix handling of CC Mode's syntactic WS cache. Make noise-macro option variables buffer local. * lisp/progmodes/cc-engine.el (c-put-is-sws, c-put-in-sws, c-remove-is-sws) (c-remove-in-sws c-remove-is-and-in-sws): Add edebug specs. (c-invalidate-sws-region-before): Add a `beg' parameter. Handle noise macros like other literals. (c-invalidate-sws-region-after-del): Move the adjustment of (cdr c-sws-lit-limits) due to buffer change to c-invalidate-sws-region-after. (c-invalidate-sws-region-after-ins): Move (goto-char end) to the correct place. (c-invalidate-sws-region-after): Adjust (cdr c-sws-lit-limits) due to buffer change. Handle noise macros. (c-backward-sws): Set simple-ws-beg appropriately when the start point is in the middle of a noise macro. (c-forward-decl-or-cast-1): Recognize a function identifier being declared in parentheses. * lisp/promodes/cc-mode.el (c-before-change): Supply a `beg' argument to c-invalidate-sws-region-before. * lisp/progmodes/cc-vars.el (c-noise-macro-with-parens-name-re) (c-noise-macro-name-re, c-noise-macro-names, c-noise-macro-with-parens-names): Make these buffer local variables.
| * * Put INLINE and ATTRIBUTE_NO_SANITIZE_UNDEFINED into c-noise-macro-namesAlan Mackenzie2019-02-171-1/+1
| | | | | | | | | | * .dir-locals (entry for c-mode): Put the two strings into c-noise-macro-names.
* | Revert set_bit signature change, fix accidental renameTassilo Horn2019-02-161-11/+11
| |
* | Merge branch 'origin/master' into scratch/replace-region-contentsTassilo Horn2019-02-1624-156/+507
|\ \ | |/
| * * src/lread.c (readevalloop): Simplify via suffix_p.Paul Eggert2019-02-161-5/+4
| |
| * * lisp/startup.el (load--user-init-file): Support early-init.elc as well.Eli Zaretskii2019-02-161-3/+9
| |
| * * lisp/startup.el: Rename load-user-init-fileStefan Monnier2019-02-161-20/+12
| | | | | | | | | | Remove redundant :groups. (startup--load-user-init-file): Rename from load-user-init-file.
| * Prevent over-eager rx character range condensationMattias Engdegård2019-02-163-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | `rx' incorrectly considers character ranges between ASCII and raw bytes to cover all codes in-between, which includes all non-ASCII Unicode chars. This causes (any "\000-\377" ?Å) to be simplified to (any "\000-\377"), which is not at all the same thing: [\000-\377] really means [\000-\177\200-\377] (Bug#34492). * lisp/emacs-lisp/rx.el (rx-any-condense-range): Split ranges going from ASCII to raw bytes. * test/lisp/emacs-lisp/rx-tests.el (rx-char-any-raw-byte): Add test case. * etc/NEWS: Mention the overall change (Bug#33205).
| * Port tramp-adb to various 'touch' platformsPaul Eggert2019-02-161-3/+14
| | | | | | | | | | * lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times): Try nanoseconds first, then plain seconds, then touch -t.
| * Fix 'early-init-file' value when file is missingEli Zaretskii2019-02-161-1/+5
| | | | | | | | | | | | | | * lisp/startup.el (command-line): Pass 'early-init.el', with an explicit .el extension, to load-user-init-file. Reported by Radon Rosborough <radon.neon@gmail.com> in http://lists.gnu.org/archive/html/emacs-devel/2019-01/msg00314.html.
| * * lisp/progmodes/cc-engine.el: Remove unneeded require of 'cl'Stefan Monnier2019-02-151-2/+0
| |
| * Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs into trunkStefan Monnier2019-02-1511-30/+135
| |\
| | * * test/lisp/textmodes/conf-mode-tests.el (conf-test-align-assignments):Glenn Morris2019-02-151-1/+1
| | | | | | | | | | | | Fix whitespace.
| | * Merge from origin/emacs-26Glenn Morris2019-02-152-15/+18
| | |\ | | | | | | | | | | | | | | | | f721084 (origin/emacs-26) Avoid errors in erc-dcc.el when erc-dcc-ver... 3cba92d Fix faces in compilation messages
| | | * Avoid errors in erc-dcc.el when erc-dcc-verbose is non-nilVictor J. Orlikowski2019-02-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/erc/erc-dcc.el (erc-dcc-get-filter): Don't assume STR is always a string. Use 'buffer-name' to get the DCC file name, as buffer-file-name is not set in the process buffer. Copyright-paperwork-exempt: yes
| | | * Fix faces in compilation messagesDaniel Lopez2019-02-151-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/compile.el (compilation-parse-errors): Don't clobber the value of TYPE inside the loop. (Bug#34479) Copyright-paperwork-exempt: yes
| | * | ; Merge from origin/emacs-26Glenn Morris2019-02-150-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | The following commit was skipped: 834ca18 * doc/misc/eshell.texi (Built-ins): Fix alias description
| | | * * doc/misc/eshell.texi (Built-ins): Fix alias descriptionGregor Zattler2019-02-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dear eamcs developers, eshells current documentation first states that alias definitions are not saved to an alias file, later that they are saved to an alias file. I tested it and the latter is correct. Please find attached a patch which fixes this. Thanks for working on emacs which is really great, Gregor >From 1fe51cc769ab7a30d0896fb3d6105c0561243fa7 Mon Sep 17 00:00:00 2001 From: Gregor Zattler <telegraph@gmx.net> Date: Wed, 13 Feb 2019 20:19:38 +0100 Subject: * doc/misc/eshell.texi (Built-ins): Fix alias description. Bring description of built-in 'alias' in line with (info "(eshell) Aliases"), which describes the actual behaviur. (cherry picked from commit a48099ce7ff63cda416a870766fe61f5b8ac7c2c)
| | * | Merge from origin/emacs-26Glenn Morris2019-02-153-7/+11
| | |\ \ | | | |/ | | | | | | | | 25d9fe2 Work for empty MIME attachments (related to bug#34387)
| | | * Work for empty MIME attachments (related to bug#34387)Katsumi Yamaoka2019-02-143-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mm-view.el (mm-inline-text): Make undisplayer do nothing if the part is empty. * mm-decode.el (mm-copy-to-buffer): Work for empty MIME part. * mml.el (mime-to-mml): Ditto.
| | * | ; Merge from origin/emacs-26Glenn Morris2019-02-150-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | The following commits were skipped: 58e0e92 Backport: js-indent-align-list-continuation: Make variable safe 6d89120 Avoid crashes upon C-g in nested invocations of 'read_char'
| | | * Backport: js-indent-align-list-continuation: Make variable safeJackson Ray Hamilton2019-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/js.el (js-indent-align-list-continuation): Indicate variable is safe as a file-local variable. This fixes the js-indent-align-list-continuation-nil test when run with make. (cherry picked from commit dd319f2711f895eec87c1017b82cd9d88d9ecd0a)
| | | * Avoid crashes upon C-g in nested invocations of 'read_char'Eli Zaretskii2019-02-131-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/keyboard.c (read_char, read_event_from_main_queue): Ensure the global value of getcjmp is restored when the stack is unwound by the likes of 'throw', by calling record_unwind_protect_ptr instead of restoring the value manually. (Bug#34394) (restore_getcjmp): Argument is now 'void *', to match the signature of record_unwind_protect_ptr. (cherry picked from commit 10527fca66e39d7067986904161fa33741abcd26)