summaryrefslogtreecommitdiff
path: root/lisp/vc
Commit message (Collapse)AuthorAgeFilesLines
...
* | Use revision-completion-table in vc-retrieve-tagDmitry Gutov2017-02-221-11/+15
| | | | | | | | | | * lisp/vc/vc.el (vc-retrieve-tag): Use the revision-completion-table command for completion (bug#25710).
* | vc-log-outgoing fixes for git; add binding to vc-dirTom Tromey2017-02-193-7/+8
| | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir-mode-map): Bind "O" to vc-log-outgoing. * lisp/vc/vc-git.el (vc-git-log-outgoing, vc-git-log-incoming): Use async execution. (vc-git-log-view-mode): Also truncate lines for log-outgoing and log-incoming. * lisp/vc/vc.el (vc-log-incoming, vc-log-outgoing): Don't pass nil as remote-location argument.
* | Remove stale comments from vc-git and vc-hgTom Tromey2017-02-192-5/+2
| | | | | | | | | | * lisp/vc/vc-git.el (vc-git-retrieve-tag): Remove comment. * lisp/vc/vc-hg.el (vc-hg-retrieve-tag): Remove comment.
* | Fix buffers update in vc-retrieve-tagDmitry Gutov2017-02-171-2/+4
| | | | | | | | | | | | * lisp/vc/vc.el (vc-retrieve-tag): When the granularity is `repository', use the repository root and pass it to vc-resynch-buffer (bug#25714).
* | Make vc-git detect conflict state for vc-dirTom Tromey2017-02-141-69/+110
| | | | | | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git-dir-status-state): New struct. (vc-git-dir-status-update-file): New function. (vc-git-after-dir-status-stage, vc-git-dir-status-goto-stage): Use vc-git-dir-status-state; add 'ls-files-conflict state. (vc-git-dir-status-files): Create a vc-git-dir-status-state.
* | Check if there are hunks before kill or refine a hunkTino Calancha2017-02-021-74/+85
| | | | | | | | | | * lisp/vc/diff-mode.el (diff--some-hunks-p): New predicate. (diff-hunk-kill, diff-file-kill, diff-refine-hunk): Use it (Bug#25571).
* | Ignore error after kill last file or hunkTino Calancha2017-02-021-2/+3
| | | | | | | | | | | | * lisp/vc/diff-mode.el (diff-hunk-kill): Go to beginning of hunk before kill. Ignore error after kill last hunk (Bug#25570). (diff-file-kill): Idem.
* | Handle patch terminators produced by git and bzr patch exportDima Kogan2017-01-311-9/+17
| | | | | | | | | | | | | | Patch by Juri Linkov posted in the #9597 bug report * lisp/vc/diff-mode.el (diff-sanity-check-hunk): Find and ignore terminator (Bug #9597, #5302)
* | Fix Bug#25524Tino Calancha2017-01-291-2/+4
| | | | | | | | | | | | * lisp/vc/diff-mode.el (diff-beginning-of-hunk): Return position at the beginning off the hunk. (diff-file-junk-re): Add SVN keywords.
* | ediff-difference-vector-alist: Drop duplicated definitionTino Calancha2017-01-251-26/+20
| | | | | | | | | | | | | | | | * lisp/vc/ediff-init.el (ediff-difference-vector-alist): Drop duplicated definition. (ediff-difference-vector-A, ediff-difference-vector-B) (ediff-difference-vector-C, ediff-difference-vector-Ancestor): Move definition before 'ediff-difference-vector-alist'.
* | diff-hunk-kill independent of point inside headersTino Calancha2017-01-211-18/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make diff-apply-hunk and diff-hunk-kill independent of the point position in a diff header (Bug#17544). This change allows to apply hunks in order. It also makes possible to press M-k repeatedly to kill hunks in the order they appear in the buffer. See discussion on #Bug25105. * lisp/vc/diff-mode.el (diff-file-junk-re): Move definition before it's used. (diff--at-diff-header-p): New predicate; return non-nil when point is inside a hunk header, a file header, or within a line matching diff-file-junk-re. (diff-beginning-of-hunk): Use it. Check if the point is inside a diff header, in the middle of a hunk, or before the first hunk. (diff-apply-hunk): Call diff-beginning-of-hunk with non-nil arg before apply the hunk. (diff-hunk-kill, diff-file-kill): Call diff-beginning-of-hunk with non-nil arg after kill the hunks. (diff-post-command-hook): Call diff-beginning-of-hunk with non-nil argument.
* | ; Revert "Improve diff-mode navigation/manipulation"Tino Calancha2017-01-211-140/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2c8a7e50d24daf19ea7d86f1cfeaa98a41c56085. This change causes regressions: https://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00738.html The following related commits are reverted as well: 61c6a10e3110490dadac4577cc540053341ff25c a283d655db88cdcc8cb53d8e2578e1cdf751c84b 6b6abe0dba6a9a2e5f78aac3814421886e7a184f e5ef59b87da5c2ddfa22f7342efe29b3eea6ed97 73349822cbd6e50526eda9c75453584d73dfca83 Fixes: debbugs:25105, 25400.
* | Avoid inefficient regex in diff-refine-hunk (Bug#25410)Noam Postavsky2017-01-181-10/+21
| | | | | | | | | | | | * lisp/vc/diff-mode.el (diff--forward-while-leading-char): New function. (diff-refine-hunk): Use it instead of trying to match multiple lines with a single lines.
* | Remove leftover references to log-view-message-faceDmitry Gutov2017-01-143-4/+4
| | | | | | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Use log-view-message. * lisp/vc/vc-git.el (vc-git-root-log-format): Same. * lisp/vc/vc-hg.el (vc-hg-root-log-format): Same.
* | Merge from origin/emacs-25Paul Eggert2017-01-0140-40/+40
|\| | | | | | | | | 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
| * Update copyright year to 2017Paul Eggert2016-12-3140-40/+40
| | | | | | | | Run admin/update-copyright.
* | Merge from origin/emacs-25Paul Eggert2017-01-012-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9adb101 Document 'describe-fontset' 229315c ; Add missing symbol quoting. 3d94931 Repair desktop restoration on text terminals 43022f9 Ignore forward-sexp-function in js-mode indentation code b19fb49 Improve documentation of 'define-coding-system' 467768f Fix Bug#25162 6db78ae Fix a typo in define-abbrev-table 5f7d906 Bump makeinfo requirement from 4.7 to 4.13 442e2f6 Fixes related to select-enable-clipboard e4ac450 Define struct predicate before acccesors 08decbd Doc fix for vc-git 5531e75 Further improve make-dist checking 953bf67 Improve previous make-dist change 129645a Make make-dist --snapshot do some sanity checks # Conflicts: # lisp/menu-bar.el
| * ; Add missing symbol quoting.Philipp Stephani2016-12-181-1/+1
| | | | | | | | * lisp/vc/ediff-util.el (ediff-janitor): Add missing symbol quoting.
| * Doc fix for vc-gitGlenn Morris2016-12-071-0/+2
| | | | | | | | * lisp/vc/vc-git.el (vc-git-region-history): Add a doc string.
* | diff-mode auto-refines only after a successful motionDima Kogan2016-12-241-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch (if enabled) auto-refinement would kick in after all hunk navigation commands, even if the motion failed. This would result in a situation where the hunk navigation would signal an error and beep, but yet still accomplish potentially useful work, by auto-refining. This patch moves the auto-refinement code to only run when a motion was successful * lisp/vc/diff-mode.el (diff--internal-hunk-next, diff--internal-hunk-prev): Removed auto-refinement-triggering code * lisp/vc/diff-mode.el (diff--wrap-navigation): Added auto-refinement-triggering code
* | diff-mode is able to better handle file headersDima Kogan2016-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced in http://git.savannah.gnu.org/gitweb/?p=emacs.git;a=commit;h=2c8a7e50d24daf19ea7d86f1cfeaa98a41c56085 This bug was filed in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25105 Patches generated from a VCS such as git contain a patch message at the start, and diff-mode is now once-again able to properly able to ignore this message when issuing navigation commands around the message. * lisp/vc/diff-mode.el (diff-beginning-of-file-and-junk): More thoroughly ignore the header when looking for a beginning of file diffs.
* | ; Spelling fixesPaul Eggert2016-12-223-6/+6
| |
* | ediff-fixup-patch-map: Improve promptTino Calancha2016-12-081-4/+17
| | | | | | | | | | * lisp/vc/ediff-ptch.el (ediff-fixup-patch-map): Make clear in the prompt when we are applying a multi patch.
* | Merge from origin/emacs-25Paul Eggert2016-12-071-0/+2
|\| | | | | | | | | | | | | ba2847f ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. ... 8b43f97 * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046) c20035c ; * doc/emacs/programs.texi (Man Page): Fix last change. 93d8346 Improve indexing of 'man'
| * ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046)Eli Zaretskii2016-12-021-1/+1
| |
| * * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)Eli Zaretskii2016-12-021-0/+2
| |
* | ediff-context-diff-label-regexp: Detect the end of second fileTino Calancha2016-12-071-5/+6
| | | | | | | | | | | | | | * lisp/vc/ediff-ptch.el (ediff-context-diff-label-regexp): Skip '\n' in file names (Bug#25010). * test/lisp/vc/ediff-ptch-tests.el: New file. (ibuffer-test-bug25010): Add test for Bug#25010.
* | Make "g" in vc push/pull buffers re-push/pullGlenn Morris2016-12-063-3/+17
| | | | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr--pushpull): * lisp/vc/vc-git.el (vc-git--pushpull): * lisp/vc/vc-hg.el (vc-hg--pushpull): Set compile-command so that "g" works. (Bug#11446)
* | Fix previous commitNoam Postavsky2016-11-291-5/+4
| | | | | | | | | | * lisp/vc/diff-mode.el (diff-refine-hunk): Make sure to go to beginning of hunk before calling `diff-hunk-style'.
* | * lisp/vc/diff-mode.el (diff-refine-hunk): Remove redundant variable.Noam Postavsky2016-11-291-1/+0
| |
* | Improve diff-mode navigation/manipulationDima Kogan2016-11-281-13/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is Bug #17544. Navigation and use of diff buffers had several annoying corner cases that this patch fixes. These corner cases were largely due to inconsistent treatment of file headers. Say you have a diff such as this: --- aaa +++ bbb @@ -52,7 +52,7 @@ hunk1 @@ -74,7 +74,7 @@ hunk2 --- ccc +++ ddd @@ -608,6 +608,6 @@ hunk3 @@ -654,7 +654,7 @@ hunk4 The file headers here are the '---' and '+++' lines. With the point on such a line, hunk operations would sometimes refer to the next hunk and sometimes to the previous hunk. Most of the time it would be the previous hunk, which is not what the user would expect. This patch consistently treats such headers as the next hunk. So with this patch, if the point is on the '--- ccc' line, the point is seen as referring to hunk3. Specific behaviors this fixes are: 1. It should be possible to place the point in the middle of a diff buffer, and press M-k repeatedly to kill hunks in the order they appear in the buffer. With the point on hunk1, M-k M-k would kill hunk1 then hunk2. With the point on hunk3, it would kill hunk3 then hunk4; this is fine. However, with the point on hunk2, it'd kill hunk2 then hunk1. This is fixed by this patch. 2. Similarly, it should be possible to apply hunks in order. Previously with the point at the start, C-c C-a would apply the hunk1, then move the point to the first @@ header, and thus C-c C-a would try to apply the same hunk again. * lisp/vc/diff-mode.el (diff--wrap-navigation): New function to add better navigation logic to diff-{hunk,file}-{next,prev}. (diff-hunk-next, diff-hunk-prev): (diff-file-next, diff-file-prev): Better navigation logic if skip-hunk-start is true, which happens when called interactively. (diff-bounds-of-hunk, diff-find-source-location): (diff-apply-hunk, diff-current-defun, diff-refine-hunk): Small tweaks to improve hunk navigation.
* | Clarify ediff-directories promptDima Kogan2016-11-232-17/+17
| | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff-mult.el (ediff-filegroup-action): * lisp/vc/ediff.el (ediff-directories,ediff-directory-revisions, ediff-directories3, ediff-merge-directories, ediff-merge-directories-with-ancestor, ediff-merge-directory-revisions, ediff-merge-directory-revisions-with-ancestor): Clarify prompt message for filename filter in interactive ediff. The new message makes it clear what is being filtered
* | Add file-local-nameMichael Albinus2016-11-202-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/files.texi (Magic File Names): Add `file-local-name'. (Unique File Names): Use it. * etc/NEWS: Mention `file-local-name'. * lisp/files.el (file-local-name): New defun. (file-expand-wildcards): * lisp/eshell/em-tramp.el (eshell/su, eshell/sudo): * lisp/eshell/esh-ext.el (eshell-remote-command): * lisp/eshell/esh-proc.el (eshell-gather-process-output): * lisp/org/ob-core.el (org-babel-local-file-name): * lisp/progmodes/gud.el (gud-common-init, gud-format-command): * lisp/progmodes/python.el (python-shell-send-file): * lisp/shell.el (shell): * lisp/vc/ediff-diff.el (ediff-same-file-contents): * lisp/vc/vc-git.el (vc-git-checkin): Use it.
* | Merge from origin/emacs-25Paul Eggert2016-11-191-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4af5981 Add a comment in generated refcards about the source ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment. 4887e7c js-mode: Fix indent problem after a regexp e992ac0 Fix sluggish display of symbols in UTF-8 language environment 1fc101b Don't confuse how Texinfo outputs @var with the input 91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame... f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da... 5b0cddd More fixes in copyright notices in etc/refcards/ f994c20 Update copyright text in refcards 9ad2ae7 Fix Outline command names 26c3554 Send text received by bracketed paste to process db0b58d Correct the statement about programming modes always running ... 78aece4 Improve documentation of 'occur' eb364fd Do call debugger on failed cl-assert 3ef4ee8 Avoid infloop in python 8da810f Don't refer to obsolete FEATURE-unload-hook 4f478ca Improve documentation of dabbrevs 7272e5d * lisp/chistory.el (list-command-history): Doc fix. (Bug#24890) 89b7482 * lisp/simple.el (set-mark-command): Doc fix. (Bug#24890) 3b199f7 Improve documentation of some Help commands 93d3a0e Fix documentation of yes-or-no prompts af04919 Fix documentation of partial completion style ed80184 Fix documentation of the mode line on emacsclient frames e6be855 Fix description of 'C-z' in User manual 16f7007 Improve and clarify documentation of Outline Mode 31d93aa Add Emacs version number to nt/README.W32 0b6b815 Fix python-mode hideshow regexp dc152c5 Modernize usage of 'macOS' in doc and comments 84c5343 Prefer comments /* like this */ in C code bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845). 3ef86fd Clarify documentation of face attribute functions de51d59 ; * nt/README.W32: Minor copyedits. db436e9 Don't call debug on failed cl-assert # Conflicts: # doc/emacs/cmdargs.texi # etc/NEWS # etc/PROBLEMS # lisp/auth-source.el # lisp/net/tramp-sh.el
| * Modernize usage of 'macOS' in doc and commentsPaul Eggert2016-11-061-2/+2
| | | | | | | | | | | | | | | | Apple changed the spelling of its operating system again, to "macOS", effective with macOS 10.12 Sierra (2016-09-20). Change Emacs documentation and comments to match this. Stick with older OS spellings ("OS X", "Mac OS X") when talking about older releases where the older names are more correct.
* | ; Replace "25.2" with "26.1" where appropriate, which is almost everywhereGlenn Morris2016-11-173-9/+9
| | | | | | | | | | | | Ref: http://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00692.html http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01215.html
* | Update parameter :version to 26.1 in several defcustomTino Calancha2016-11-172-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following defcustom where added or modified for 25.2 release. In fact all these changes belong to 26.1 release. * lisp/battery.el (battery-linux-sysfs-regexp) * lisp/comint.el (comint-password-prompt-regexp) * lisp/dired.el (dired-always-read-filesystem) * lisp/image.el (image-scaling-factor) * lisp/ibuf-ext.el (ibuffer-never-search-content-name) (ibuffer-never-search-content-mode) * lisp/mouse.el (mouse-select-region-move-to-beginning) * lisp/net/net-utils.el (iwconfig-program, iwconfig-program-options) (netstat-program, route-program, route-program-options) * lisp/net/sieve-manage.el (sieve-manage-default-stream) * lisp/progmodes/grep.el (grep-save-buffers) * lisp/vc/add-log.el (change-log-directory-files) * lisp/url/url-vars.el (url-user-agent) * lisp/vc/vc-hg.el (vc-hg-symbolic-revision-styles) (vc-hg-use-file-version-for-mode-line-version) (vc-hg-parse-hg-data-structures) * lisp/wdired.el (wdired-create-parent-directories) * lisp/faces.el (homoglyph, nobreak-hyphen, read-multiple-choice-face) * lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol) (gnus-button-url-regexp) * lisp/window.el (switch-to-buffer-preserve-window-point) * lisp/ibuffer.el (ibuffer-formats, ibuffer-locked-char) (ibuffer-locked-buffer) * lisp/textmodes/flyspell.el (flyspell-sort-corrections-function) * lisp/emacs-lisp/edebug.el (edebug-sit-on-break) * lisp/gnus/message.el (message-user-fqdn) * lisp/simple.el (shell-command-dont-erase-buffer) (extended-command-suggest-shorter) * lisp/net/shr.el (shr-use-fonts) * lisp/files.el (mounted-file-systems, kill-emacs-query-functions)
* | add `vc-git-print-log-follow' and use it in `vc-git-print-log'Sam Steingold2016-11-141-1/+12
| | | | | | | | | | | | When `vc-git-print-log-follow' is true and all files are non-directory, pass "--follow" to "git log". This works around bug#8756 and bug#16422.
* | vc-git-print-log: pass "--follow" to "log" to handle renamed filesSam Steingold2016-11-141-1/+1
| |
* | Merge from origin/emacs-25Paul Eggert2016-11-041-1/+5
|\| | | | | | | | | | | | | | | | | | | | | acae275 ; Spelling fixes d8fac73 Update README for precompiled windows Emacs. 23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks f708cb2 Clarify doc string of 'transpose-sexps' cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab' bdc89eb Improve documentation of 'font-lock-remove-keywords' 4a0c590 Fix documentation of the command summary key 0221b7a Mark relocation workarounds with REL_ALLOC
| * Clarify documentation of 'vc-responsible-backend' wrt symlinksHong Xu2016-11-041-1/+5
| | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-responsible-backend): Clarify that symlinks are not resolved when the VC backend is reported. * doc/lispref/files.texi (Truenames): Document 'vc-responsible-backend'. (Bug#23436) * doc/emacs/maintaining.texi (Version Control Systems): Fix a typo.
* | Merge from origin/emacs-25Paul Eggert2016-10-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50fa7d6 ;* src/w32heap.c: Fix typo and wording of the comments. 6f1325e electric-quote mode no longer worries about coding c2a1792 * src/regex.c (re_search_2): Make new code safe for -Wjump-mi... f6134bb Port to GCC 6.2.1 + --enable-gcc-warnings b2ba630 Explain how to debug emacsclient lisp errors 9da53e2 Let describe-function work for lambda again 5c2da93 Fix kill-line's docstring ad66b3f Fix handling of allocation in regex matching 5a26c9b * lisp/electric.el (electric-quote-mode): Improve doc (Bug#24... 3877c91 vc-region-history: Search just on lines intersecting the region 8988327 Fix documentation of 'alist-get' b6998ea * src/regex.h (re_match_object): Improve commentary. # Conflicts: # etc/NEWS # lisp/help-fns.el
| * vc-region-history: Search just on lines intersecting the regionTino Calancha2016-10-201-1/+1
| | | | | | | | | | * lisp/vc/vc.el (vc-region-history): If region ends in the beginning of a line, then exclude that line from the search (Bug#24725).
* | Merge from origin/emacs-25Paul Eggert2016-10-231-106/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ad0d7d ; Fix quoting in etc/NEWS 6b9dee1 Change Tramp version to "2.2.13.25.2" 62f2684 * lisp/emacs-lisp/autoload.el (update-directory-autoloads): F... b2f32e4 Don't scan compiled module files for autoloads 9a758b4 Fix Bug#24698 baa8ba4 * lisp/subr.el (start-process): Doc fix. (Bug#24693) e535ca4 Fix display of vc-dir CVS file statuses in subdirectories 12da149 Update URL of MS-Windows optional DLLs 2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... a4285bc * lisp/simple.el (process-menu-mode, list-processes--refresh)... b0c447e * lisp/ibuf-ext.el (ibuffer-do-shell-command-file): Fix non-f... cf3c19b * lisp/ibuffer.el (ibuffer): Improve 'other-window' case. (B... # Conflicts: # doc/misc/trampver.texi # etc/NEWS # lisp/net/tramp-sh.el # lisp/net/trampver.el
| * Fix display of vc-dir CVS file statuses in subdirectoriesGöktuğ Kayaalp2016-10-181-106/+31
| | | | | | | | | | | | | | * lisp/vc/vc-cvs.el (vc-cvs-dir-status-files): Use 'cvs update' instead of 'cvs status'. It's faster, easier to parse, and relieves us of the need to use vc-expand-dirs. (Bug#24082) (vc-cvs-after-dir-status): Parse its output.
* | Add `make-nearby-temp-file' and `temporary-file-directory'Michael Albinus2016-08-072-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Make emerge always use shell-quote-argumentNoam Postavsky2016-08-061-25/+12
| | | | | | | | | | | | | | | | | | * 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'.
* | Prevent to apply funcall on tStefan Monnier2016-07-121-1/+3
| | | | | | | | | | * lisp/vc/ediff-util.el (ediff-really-quit): Ignore the global part of 'ediff-after-quit-hook-internal' hook (Bug#23933).
* | Fix breakage from previous changeMark Oteiza2016-06-281-2/+2
| | | | | | | | | | * lisp/textmodes/tex-mode.el (tex-font-lock-keywords-1): * lisp/vc/log-view.el (log-view-font-lock-keywords): Quote face.
* | ; Fix breakage from previous commitStephen Berman2016-06-271-16/+16
| |