summaryrefslogtreecommitdiff
path: root/lisp/vc
Commit message (Expand)AuthorAgeFilesLines
* 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. Michael Albinus2016-08-072-2/+7
* 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'. Noam Postavsky2016-08-061-25/+12
* Prevent to apply funcall on t...* lisp/vc/ediff-util.el (ediff-really-quit): Ignore the global part of 'ediff-after-quit-hook-internal' hook (Bug#23933). Stefan Monnier2016-07-121-1/+3
* Fix breakage from previous change...* lisp/textmodes/tex-mode.el (tex-font-lock-keywords-1): * lisp/vc/log-view.el (log-view-font-lock-keywords): Quote face. Mark Oteiza2016-06-281-2/+2
* ; Fix breakage from previous commitStephen Berman2016-06-271-16/+16
* Merge from origin/emacs-25...0377fe2 ; Spelling fixes f253695 Update docs for `customize-mode' 4395aaa Fix documentation of 'assoc-string' and 'compare-strings' ab0ebb9 ; Only load .elc file in tests. a98aa02 Error on multibyte characters in HTTP request ea512a7 * lisp/gnus/mm-decode.el (mm-convert-shr-links): Mask keys th... 8297331 ; Revert "Ensure undo-boundary after insert-file-contents." dc5e65b Unset GIT_DIR when calling Git commands 6cdd8f7 Ensure undo-boundary after insert-file-contents. 4793f5f Clarify documentation of 'line-spacing' and 'line-height' 5f37572 Fix removal of variables from process-environment e5e886d * admin/authors.el (authors-ignored-files, authors-valid-file... db0777b * admin/authors.el (authors-aliases, authors-fixed-case): Add... # Conflicts: # doc/lispref/modes.texi # lisp/gnus/mm-decode.el Paul Eggert2016-06-261-1/+3
|\
| * Unset GIT_DIR when calling Git commands...* lisp/vc/vc-git.el (vc-git--call, vc-git-command): Unset GIT_DIR (bug#23769). Dmitry Gutov2016-06-221-1/+3
* | Remove some face aliases obsoleted in 22.1...* lisp/faces.el (modeline-inactive, modeline-highlight, modeline-buffer-id): * lisp/hilit-chg.el (highlight-changes-face, highlight-changes-delete-face): * lisp/info.el (Info-title-1-face, Info-title-2-face, Info-title-3-face, Info-title-4-face, info-menu-5): * lisp/obsolete/old-whitespace.el (whitespace-highlight-face): * lisp/paren.el (show-paren-match-face, show-paren-mismatch-face): * lisp/progmodes/make-mode.el (makefile-space-face): * lisp/textmodes/texinfo.el (texinfo-heading-face): Remove. (texinfo-font-lock-keywords): Use texinfo-heading face. * lisp/vc/add-log.el (change-log-date-face, change-log-name-face, change-log-email-face, change-log-file-face, change-log-list-face, change-log-conditionals-face, change-log-function-face, change-log-acknowledgement-face): * lisp/vc/diff-mode.el (diff-header-face, diff-file-header-face, diff-index-face, diff-hunk-header-face, diff-removed-face, diff-added-face, diff-changed-face, diff-function-face, diff-context-face, diff-nonexistent-face): Remove. (diff-use-changed-face, diff-font-lock-keywords): Use non-obsolete face symbols. (diff-hunk-file-names): Fix comment. (diff-refine-change): Remove. (diff-refine-removed, diff-refine-added, diff-refine-hunk): Use non-obsolete face. * lisp/vc/log-view.el (log-view-file-face, log-view-message-face): Remove. (log-view-font-lock-keywords): Use non-obsolete face names. * lisp/vc/pcvs-info.el (cvs-header-face, cvs-filename-face, cvs-unknown-face, cvs-handled-face, cvs-need-action-face, cvs-marked-face, cvs-msg-face): * lisp/wid-edit.el (widget-documentation-face, widget-button-face, widget-field-face, widget-single-line-field-face, widget-inactive-face, widget-button-pressed-face): * lisp/woman.el (woman-italic-face, woman-bold-face, woman-unknown-face, woman-addition-face): Remove. Mark Oteiza2016-06-234-71/+27
* | ASCII-fy coding-system-for-read used for Git commands...* lisp/vc/vc-git.el (vc-git--asciify-coding-system): New function. (vc-git-diff, vc-git-annotate-command): Use it. Dmitry Gutov2016-06-191-0/+9
* | Merge from origin/emacs-25...c3489d0 * lisp/w32-fns.el (set-message-beep, w32-get-locale-info) (w3... a4d882c Correct old cell name unbinding when renaming cell. 6c12c53 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into... 0be6725 Document problem: slow screen refresh on missing font. 853b9b9 * admin/admin.el (add-release-logs): Basic check of existing ... 5fa80cf * build-aux/gitlog-to-emacslog: Handle empty generated Change... 3c79e51 * admin/admin.el (add-release-logs): Generate ChangeLog if ne... 42275df * doc/misc/texinfo.tex: Revert previous change (Bug#23611). 3f4a9d9 * admin/authors.el (authors): First update the ChangeLog. 897fb6f ; 'Changes from the pre-25.1 API' copyedits 825ca25 Rename vc-stay-local back to vc-cvs-stay-local 4efb3e8 * doc/emacs/files.texi (Comparing Files): * doc/emacs/trouble... b995d1e * doc/misc/eww.texi (Advanced): Fix xref. 2e589c0 Fix cross-references between manuals f3d2ded * doc/misc/vhdl-mode.texi (Sample Init File): Rename node to ... 906c810 ; * admin/release-process: Move etc/HISTORY from here... ; * ... bea1b65 * admin/admin.el (add-release-logs): Also update etc/HISTORY. 503e752 ; * CONTRIBUTE: Fix a typo. fbfd478 Avoid aborting due to errors in arguments of 'set-face-attrib... bdfbe6d ; * admin/release-process: Copyedits. 44a6aed ; * test/automated/data-tests.el: Standardize license notice. c33ed39 ; * test/automated/viper-tests.el: Standardize license notice. df4a14b Add automated test for viper-tests.el c0139e3 Fix viper undo breakage from undo-boundary changes 920d76c Fix reference to obsolete fn ps-eval-switch 18a9bc1 Do not trash symlinks to init file 2671179 Don't print the "decomposition" line for control chars in wha... 869092c Bring back xterm pasting with middle mouse 5ab0830 Provide workaround for xftfont rendering problem c9f7ec7 * lisp/desktop.el: Disable restore frameset if in non-graphic... 30989a0 Mention GTK+ problems in etc/PROBLEMS 421e3c4 * lisp/emacs-lisp/package.el (package-refresh-contents): dadfc30 Revert "epg: Add a way to detect gpg1 executable for tests" e41a5cb Avoid errors with Czech and Slovak input methods d4ae6d7 epg: Add a way to detect gpg1 executable for tests ebc3a94 * lisp/emacs-lisp/package.el: Fix free variable warnings. 6e71295 * lisp/emacs-lisp/package.el (package--with-response-buffer): c45d9f6 Improve documentation of 'server-name' 3b5e38c Modernize ASLR advice in etc/PROBLEMS 1fe1e0a * lisp/char-fold.el: Rename from character-fold.el. Paul Eggert2016-05-262-15/+14
|\|
| * ; 'Changes from the pre-25.1 API' copyeditsDmitry Gutov2016-05-251-5/+5
| * Rename vc-stay-local back to vc-cvs-stay-local...* lisp/vc/vc-cvs.el (vc-cvs-stay-local): Rename back from vc-stay-local (bug#19548). Improve the docstring. (vc-cvs-stay-local-p): Update accordingly. Dmitry Gutov2016-05-252-10/+9
* | Pacify byte-compiler in lisp/vc...* lisp/vc/vc-bzr.el, lisp/vc/vc-cvs.el, lisp/vc/vc-hg.el: * lisp/vc/vc-rcs.el, lisp/vc/vc-src.el: Declare functions defined elsewhere, to forestall “might not be defined at runtime” warnings. Paul Eggert2016-05-105-0/+22
* | * lisp/vc/ediff-util.el: Use lexical-binding.Stefan Monnier2016-05-041-12/+16
* | Merge from origin/emacs-25...16e5e8e Fix last change to isearch-update (bug#23406) b755d98 Autoload cursor-sensor-inhibit (bug#23406) b52ebd4 org-map-entries: Fix org-agenda-prepare-buffers call 86aa409 Followup for last commit in the user manual 7004459 Improve doc string of 'set-goal-column' ccdaf04 Fix the MSDOS build ffe701c Remove \= from format string (bug#18190) 1c58fa1 Fix variable-pitch font on MS-Windows c6077bf Restore follow-scroll-up/down to scrolling by the combined si... b671e21 Revert unneeded change which harms syntactic parsing. This f... 48b24c9 Correct indentation of ids in a C++ enum after a protection k... 5c3534f * lisp/window.el (window--process-window-list): No-op if no p... 734fb3a Port dumping to NetBSD with PaX 0255a70 Don't mistake `for' inside a function for a part of array com... # Conflicts: # src/Makefile.in Paul Eggert2016-05-011-1/+1
|\|
| * Fix the MSDOS build...* config.bat: * msdos/sedlisp.inp: * msdos/sedlibmk.inp: * msdos/sedleim.inp: * msdos/sedadmin.inp: * msdos/sed6.inp: * msdos/sed3v2.inp: * msdos/sed2v2.inp: * msdos/sed1v2.inp: Adapt to Emacs 25. * src/process.c (remove_slash_colon): Move out of "#ifdef subprocesses" block, as it its called unconditionally. Move ADD_SUBFEATURE calls into "#ifdef subprocesses" block, as they reference variables only defined in that block. * src/msdos.h: Provide prototypes for IT_set_frame_parameters, faccessat, msdos_fatal_signal, syms_of_msdos, pthread_sigmask, dos_keysns, dos_keyread, run_msdos_command, and syms_of_win16select, to avoid compiler warnings. * src/msdos.c (SYS_ENVIRON): Define to either '_environ' or 'environ', depending on the DJGPP version. Remove declarations of externally-visible Lisp objects, like Qbackground_color and Qreverse. (run_msdos_command): First argument is not signed, not unsigned. Use SYS_ENVIRON. (sys_select): Use 'timespec_cmp' instead of 'timespec_sign', as the latter doesn't work when 'time_t' is an unsigned data type. This caused idle timers to behave incorrectly: they only fired after a keyboard input event. * src/frame.c (adjust_frame_size) [MSDOS]: Account for FRAME_TOP_MARGIN that isn't counted in the frame's number of lines, but dos_set_window_size needs it to be added. * src/lread.c (INFINITY, NAN) [DJGPP < 2.05]: Provide definitions. * src/fns.c (sort_vector_copy) [__GNUC__ < 4]: Provide a prototype that works around compilation errors with older GCC versions. * src/w16select.c: Don't declare QCLIPBOARD and QPRIMARY as Lisp Objects. * src/filelock.c [MSDOS]: Ifdef away most of the code. Provide no-op implementations for 'lock_file' and 'unlock_file'. (Ffile_locked_p) [MSDOS]: Always return nil. This avoids multiple ifdefs in all users of filelock.c functionality. * src/conf_post.h (EOVERFLOW, SIZE_MAX) [DJGPP < 2.04]: Define. * src/emacs.c [MSDOS]: Include dosfns.h, to avoid compiler warnings. * src/dosfns.h: Provide prototypes for dos_cleanup, syms_of_dosfns, and init_dosfns. * src/deps.mk (atimer.o): Depend on msdos.h. (emacs.o): Depend on dosfns.h. * src/atimer.c [MSDOS]: Include msdos.h, to avoid compiler warnings. * lisp/window.el (window--adjust-process-windows): Skip the body if 'process-list' is not available. This avoids failure to start up on MS-DOS. * lisp/vc/diff.el (diff-no-select): Test 'make-process', not 'start-process', as the latter is now available on all platforms. * lisp/textmodes/ispell.el (ispell-async-processp): Replace 'start-process' with 'make-process' in a comment. * lisp/term/internal.el (IT-unicode-translations): Modify and add a few translations to display Info files with Unicode markup. Fix an ancient off-by-one mismatch error with Unicode codepoints. * lisp/progmodes/compile.el (compilation-start): Test 'make-process', not 'start-process', as the latter is now available on all platforms. * lisp/man.el (Man-build-man-command, Man-getpage-in-background): Test 'make-process', not 'start-process', as the latter is now available on all platforms. * lisp/international/mule-cmds.el (set-coding-system-map): Test 'make-process', not 'start-process', as the latter is now available on all platforms. * lisp/eshell/esh-cmd.el (eshell-do-pipelines-synchronously): Doc fix. (eshell-execute-pipeline): Test 'make-process', not 'start-process', as the latter is now available on all platforms. Eli Zaretskii2016-04-301-1/+1
* | Merge from origin/emacs-25...71fb0e0 Improve last change to vc-git-mode-line-string 6858e77 Todo mode doc bug fix e55d0db Fix revision calculation in vc-git-mode-line-string ca87b34 ; Fix errant revert ccb75d7 40bfebe Add Python 3.5 keyword "await" fa7886a Add new keywords of Python 3.5 ccb75d7 Partially revert previous change. 8ee168a ; * etc/NEWS: Update entry about color fonts on OS X with a w... b09ca27 Say why text-quoting-style is not a user option Paul Eggert2016-05-011-1/+1
|\|
| * Improve last change to vc-git-mode-line-string...* lisp/vc/vc-git.el (vc-git-mode-line-string): Better fix that caches the result. Leo Liu2016-04-271-1/+1
| * Fix revision calculation in vc-git-mode-line-string...* lisp/vc/vc-git.el (vc-git-mode-line-string): Use vc-git-working-revision because vc-working-revision needs to decide the backend and may return nil. Leo Liu2016-04-271-1/+1
* | No need to test for jka-compr...* lisp/vc/ediff-util.el (ediff-file-compressed-p): jka-compr is always available; no need to test (bug#18204). Lars Ingebrigtsen2016-04-301-5/+2
* | Revert the disputed VC change and update the tests...* lisp/vc/vc-hooks.el (vc-working-revision): Remove the previous change. (vc-state): Same. And update the old, incorrect comment about unregistered files (http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00526.html). * test/lisp/vc/vc-tests.el (vc-test--state): Remove the check calling `vc-state' on default-directory (VC state is undefined for directories). Check that `vc-state' returns nil where it returned `unregistered' before. Remove all checks comparing invocations with the backend passed in explictly and without. (vc-test--working-revision): Remove all checks comparing invocations with the backend passed in explictly and without. Update comments, and add a new one. Dmitry Gutov2016-04-241-14/+16
* | Merge from origin/emacs-25...9daf1cf * etc/NEWS: Improve wording of vc-git-log-output-coding-syste... 0cd2e92 Don't kill ~/ if it's the top level directory 4f40f5f describe-char: fix insert char documentation 87ee542 (vc-git-mode-line-string): Don't use `replace-regexp-in-string' Paul Eggert2016-04-241-1/+1
|\|
| * (vc-git-mode-line-string): Don't use `replace-regexp-in-string'...* lisp/vc/vc-git.el (vc-git-mode-line-string): Use `substring' instead of `replace-regexp-in-string', because REV can be nil (e.g. when FILE is a directory, bug#23344), and we actually know we only need the first 4 characters. Dmitry Gutov2016-04-231-1/+1
* | Merge from origin/emacs-25...78f9af7 ; ChangeLog fixes 162e549 * admin/authors.el (authors-ignored-files): Additions. 2b31a0c In x_set_window_size restore do_pending_window_change calls 401857e Fix Alt-modified keys on some European MS-Windows keyboards a77cf24 Document 'help-go-forward' 1ba947f Revert "Allow to customize names of executables used by grep.el" 570e0fa Revert "Don't use 'find-program'" 645f4ef Revert "Use 'grep-find-program' in check-declare.el" aa03257 Clarify documentation of 'dired-mark-files-containing-regexp' ce0d8c7 Make tmm-menubar work in correct order again b8d5a8f Remove the Meta-CVS VC backend Paul Eggert2016-04-242-2/+2
|\|
| * Remove the Meta-CVS VC backend...* lisp/obsolete/vc-mcvs.el: Remove the file (bug#20475). * lisp/vc/log-view.el (log-view-extract-comment): Remove the MCVS reference. * doc/misc/efaq-w32.texi (Version control): Same. Dmitry Gutov2016-04-192-2/+2
| * Fix Bug#20637. Do not merge to master...* lisp/vc/vc-hooks.el (vc-state, vc-working-revision): Use `vc-backend' instead of `vc-responsible-backend'. (Bug#20637) * test/automated/vc-tests.el (vc-test--state) (vc-test--working-revision): Deactivate now failing checks. Michael Albinus2016-04-141-2/+2
* | Some improvements in vc...* lisp/vc/vc-hooks.el (vc-state, vc-working-revision): Check, whether FILE is registered. * lisp/vc/vc-rcs.el (vc-rcs-checkout-model): Return `locking' for nonexistent files. * test/lisp/vc/vc-tests.el (w32-application-type): Declare. (vc-test--revision-granularity-function) (vc-test--unregister-function): Use `vc-call-backend'. (vc-test--run-maybe-unsupported-function): New defmacro. (vc-test--register, vc-test--state, vc-test--working-revision) (vc-test--checkout-model): Use it. Fix also expected results. (vc-test-src02-state, vc-test-rcs04-checkout-model): They pass now. Michael Albinus2016-04-242-7/+12
* | Support OFFSET and (OFFSET ABBR) time zone rules...This simplifies Gnus and VC time zone support, by letting them feed the output of ‘current-time-zone’ and ‘decode time’ to primitives that accept time zone arguments. * doc/lispref/os.texi (Time Zone Rules, Time Conversion): * etc/NEWS: * lisp/gnus/message.el (message-insert-formatted-citation-line): * lisp/org/org.el (org-timestamp-format): * src/editfns.c (Fformat_time_string, Fdecode_time): (Fcurrent_time_string, Fcurrent_time_zone, Fset_time_zone_rule): Document new behavior. * lisp/gnus/gmm-utils.el (gmm-format-time-string): * lisp/vc/add-log.el (add-log-iso8601-time-zone): Mark as obsolete, as it is now just an alias or narrow wrapper around format-time-string. * src/editfns.c (tzlookup): Also support integer OFFSET and list (OFFSET ABBR) as time zone rules. (Fencode_time): No longer need a special case for a cons ZONE. (Fcurrent_time_zone): If the time zone string is missing, compute it the same way the other new code does. Paul Eggert2016-04-121-15/+4
* | Merge from origin/emacs-25...ca50981 Improve time zone documentation c23c965 Prevent bootstrap autoload backup files 9344612 Disable multicolor fonts on OS X since they are not supported... c41ce1c Capitalize “Universal Time” in documentation 10597c9 Don't use 'find-program' Paul Eggert2016-04-121-4/+3
|\|
| * Capitalize “Universal Time” in documentation...It’s a proper noun. * lisp/vc/add-log.el (add-log-time-zone-rule): Also, fix typo by mentioning ‘format-time-string’ instead of ‘set-time-zone-rule’. Paul Eggert2016-04-111-4/+3
* | Merge from origin/emacs-25...b134c20 Sync with gnulib bb30fa9 Fix last change on 2016-01-02 488a72f ; Spelling fixes 9b1aab9 Port run-prolog EMACS to SWI-Prolog 7.2.3 0e7bcec Avoid crashes due to unreasonably large or small text scaling 85f257c Improve documentation of 'with-eval-after-load' 668c7bc Improve handling of non-ASCII characters in Git log messages b570769 Remove undefined behavior in OS X dumper. 97211f3 Fix clipping of xwidgets e87fbc0 Improve Lisp-level documentation of tooltips 9f1786e Faces names should not end in "-face". 3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings. a1f221b Comint and compile no longer set EMACS 5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2... a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... c93ae7a Allow to customize names of executables used by grep.el f6497c6 Set locale encoding to UTF-8 when run from OS X GUI. 7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt a3f1ac2 Avoid infinite loop in 'studlify-word' f36df4b Don’t recommend obsolete EMACS env var fb0b531 * lisp/emacs-lisp/package.el: Change from a few days ago need... Paul Eggert2016-04-112-24/+60
|\|
| * Improve handling of non-ASCII characters in Git log messages...* lisp/vc/vc-git.el (vc-git-commits-coding-system): Now a defcustom. (vc-git-log-output-coding-system): New defcustom. (vc-git-print-log, vc-git-command, vc-git--call): Use 'vc-git-log-output-coding-system' for reading stuff from Git. Don't override values of 'coding-system-for-read/write' if they are bound by caller -- this allows the user to force an encoding via "C-x RET c". (vc-git-checkin): On MS-Windows, pass the log message via a temporary file, to work around the limitations on passing non-ASCII characters via command-line arguments. Force using the 'locale-coding-system' for Git command-line arguments. This fixes problems with non-ASCII commit log messages on MS-Windows. (Bug#23076) * etc/NEWS: Mention the new vc-git related defcustoms. Eli Zaretskii2016-04-101-15/+51
| * Faces names should not end in "-face"....* lisp/rect.el (rectangle-preview): Rename from rectangle-preview-face. * lisp/vc/vc-hooks.el (vc-state-base): Rename from vc-state-base-face. Glenn Morris2016-04-081-9/+9
* | Add vc-backend and vc-responsible-backend tests...* lisp/vc/vc-hooks.el (vc-file-setprop, vc-file-getprop) (vc-file-clearprops): Use properties on absolute files. * test/lisp/vc/vc-tests.el (vc-test--unregister-function): Clear file properties. (vc-test--register): Add tests for `vc-backend' and `vc-responsible-backend'. Catch other errors but `vc-not-supported'. (vc-test--state, vc-test--checkout-model): Catch other errors but `vc-not-supported'. (vc-test--working-revision): Fix test for RCS and SCCS. Catch other errors but `vc-not-supported'. (vc-test-src02-state): Mark as an expected failure. Michael Albinus2016-04-091-3/+3
* | Spelling fixesPaul Eggert2016-04-031-1/+1
* | Merge from origin/emacs-25...b787d55 More format-time-string change fixups 13c8f29 make-xwidget unused arg cleanup 36e05f0 Remove unused arguments from make-xwidget 1042217 Document incompatible changes in 'format-time-string' 7228eb8 Improve documentation of byte-code objects 0020047 Adapt calls to 'format-time-string' to changes in Emacs 25 17b5152 Improve vc-diff with Git backend c28f87a (js--continued-expression-p): Special-case unary plus and minus 2d02a5f ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary. 9151f16 Prevent C++ Mode wrongly fontifying some identifiers near tem... b3b523c Avoid crashes due to insanely large columns in tabulated-list... a3daa34 Teach M-x disassemble a default argument. e30c3e9 Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows df441b3 Fix OS X specific settings in tramp-tests 2244331 Finish fixing a cacheing bug in CC Mode (see 2016-03-09) # Conflicts: # lisp/net/tramp-sh.el # lisp/progmodes/cc-engine.el Paul Eggert2016-04-033-4/+16
|\|
| * Adapt calls to 'format-time-string' to changes in Emacs 25...* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries): Use t as the last argument to format-time-string. (Bug#23128) * lisp/gnus/gmm-utils.el (gmm-format-time-string): Use t as the last argument to format-time-string, when the TZ argument is not a number, per the doc string. Eli Zaretskii2016-04-021-1/+1
| * Improve vc-diff with Git backend...* lisp/vc/vc-git.el (vc-git-command): Don't override coding-system-for-read/write if they are already bound. Suggested by joaotavora@gmail.com (João Távora). (Bug#20892) (vc-git-print-log): Don't override coding-system-for-read if it's already bound. Eli Zaretskii2016-04-021-3/+6
| * ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary.Eli Zaretskii2016-04-011-4/+5
| * Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows...* lisp/vc/vc-annotate.el (vc-annotate): Force DOS EOL decoding on MS-Windows and MS-DOS, when processing the output of "svn annotate". Eli Zaretskii2016-03-311-0/+8
| * ; * lisp/vc/vc-hooks.el: corrected docstring of face...Do not merge to master Oscar Fuentes2016-03-011-1/+1
* | Don't bug out on nil `patch-buf' arguments...* lisp/vc/ediff.el (ediff-patch-file): Don't bug out on nil `patch-buf' arguments. Lars Magne Ingebrigtsen2016-03-201-2/+2
* | * lisp/vc/vc-hooks.el: Fix typoOscar Fuentes2016-03-191-1/+1
* | make `vc-log-operation' buffer local to allow multiple simultaneous editingSam Steingold2016-03-171-1/+2
* | Revert "Use colors in the VC mode lines"...This reverts commit 2621c293d82c15c00d9e73a8db75d70da7d0a23b. John Wiegley2016-03-061-15/+8
* | Use colors in the VC mode lines...* lisp/vc/vc-hooks.el: Make the mode line faces default to using colors to more clearly tell the user what the status is. Lars Ingebrigtsen2016-03-011-8/+15
* | Strip out some leading whitespace when looking at logs...* lisp/vc/vc-git.el (vc-git-expanded-log-entry): When looking at expanded git logs with `vc-print-root-log' (C-x v L, then <enter> by default), Emacs was stripping out all leading whitespace from git logs. I now strip exactly 2 leading spaces, which retains the indentation in the logs (bug#18110). Dima Kogan2016-02-281-1/+3
* | Fix error in add-change-log-entry when the entry has no newline...* lisp/vc/add-log.el (add-change-log-entry): The entry in the ChangeLog may end without a new line starting with blanks. Lars Ingebrigtsen2016-02-241-2/+4
* | Require that the buffer that we're trying to patch exist...* lisp/vc/ediff.el (ediff-patch-buffer): Require that the buffer that we're trying to patch exist (bug#21852). Lars Ingebrigtsen2016-02-231-1/+2
* | Require that the buffer that we're trying to patch exist...* lisp/vc/ediff.el (ediff-patch-buffer): Require that the buffer that we're trying to patch exist (bug#21852). Copyright-paperwork-exempt: yes Tino Calancha2016-02-231-3/+2