mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 00:51:50 -08:00
Code Issues Projects Releases Wiki Activity
111237 commits 243 branches 194 tags 7.8 GiB
Commit graph

342 commits

Author SHA1 Message Date
Glenn Morris
712b9732db Silence the rest of vc compilation 
* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
Declare.
(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.

* vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
(grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.

* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.

* vc/vc-sccs.el (vc-file-tree-walk): Declare.
(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
(vc-tag-precondition, vc-rename-master): Autoload.
 2013-05-28 00:47:11 -07:00
Glenn Morris
e658d75cda Silence some vc compilation warnings 
* lisp/vc/vc-arch.el (vc-exec-after): Declare.
(vc-switches): Autoload.

* lisp/vc/vc-bzr.el: No need to require vc when compiling.
(vc-exec-after, vc-set-async-update, vc-default-dir-printer)
(vc-resynch-buffer, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches): Autoload.

* lisp/vc/vc-dir.el (desktop-missing-file-warning): Declare.

* lisp/vc/vc-mtn.el (vc-exec-after): Declare.
(vc-switches): Autoload.

* lisp/vc/vc-rcs.el (vc-expand-dirs, vc-switches)
(vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload.
(vc-file-tree-walk): Declare.

* lisp/vc/vc-svn.el (vc-exec-after): Declare.
(vc-switches, vc-setup-buffer): Autoload.

* lisp/obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert):
Autoload.
(vc-resynch-buffer): Declare.
 2013-05-28 00:01:59 -07:00
Dmitry Gutov
f1a60a0f07 * lisp/vc/vc-git.el (vc-git-working-revision): When in detached mode, 
return the commit hash.  Also set the `vc-git-detached' property.
(vc-git--rev-parse): Extract from `vc-git-previous-revision'.
(vc-git-mode-line-string): Use the same help-echo format whether in
detached mode or not, because we know the actual revision now.  When
in detached mode, shorten the revision to 7 chars.

Fixes: debbugs:14459
 2013-05-28 03:11:21 +04:00
Glenn Morris
a5c7df1a4b Silence ediff compilation 
* lisp/vc/ediff-diff.el, lisp/vc/ediff-merg.el: Require ediff-util at run-time.

* lisp/vc/ediff-mult.el: Adjust requires.
(ediff-directories-internal, ediff-directory-revisions-internal)
(ediff-patch-file-internal): Declare.

* lisp/vc/ediff-ptch.el: Adjust requires.
(ediff-use-last-dir, ediff-buffers-internal): Declare.
(ediff-find-file): Autoload.

* lisp/vc/ediff-util.el: No need to load ediff when compiling.
(ediff-regions-internal): Declare.

* lisp/vc/ediff-wind.el: Adjust requires.
(ediff-compute-toolbar-width): Define when compiling.
(ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare.

* lisp/vc/ediff.el: No need to load dired, ediff-ptch when compiling.
(dired-get-filename, dired-get-marked-files)
(ediff-last-dir-patch, ediff-patch-default-directory)
(ediff-get-patch-buffer, ediff-dispatch-file-patching-job)
(ediff-patch-buffer-internal): Declare.
 2013-05-23 00:10:05 -07:00
Glenn Morris
5f70c1698a * lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs. 2013-05-21 20:17:22 -07:00
Glenn Morris
a8899b6b3a More missing :version tags for defcustoms 2013-05-06 00:10:31 -07:00
Richard M. Stallman
6c54491c95 * vc/compare-w.el (compare-windows-whitespace): 
Treat no-break space as whitespace.
 2013-05-05 10:10:51 -04:00
Glenn Morris
f12ad6ecd9 * lisp/vc/vc-dir.el (vc-dir-mode): Don't autoload it for everyone. 
* lisp/desktop.el (vc-dir-mode): Just autoload it here.
 2013-05-02 13:47:39 -04:00
Glenn Morris
685c9501cd * vc/log-view.el (log-view-current-entry): 
Treat "---" separator lines as part of the following rev.

Fixes: debbugs:14169
 2013-04-27 14:29:00 -07:00
Glenn Morris
1c141dad87 * lisp/vc/vc-bzr.el (vc-bzr-print-log): Tweak LIMIT = 1 case. 2013-04-24 20:53:18 -04:00
Glenn Morris
3b8fe7527b * vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1. 
Fixes: debbugs:14168
 2013-04-24 01:13:52 -07:00
Glenn Morris
90b4237a6b vc-hg, vc-svn print-log fixes for start-revision with limit != 1 
* vc/vc-hg.el (vc-hg-print-log):
* vc/vc-svn.el (vc-svn-print-log): Fix START-REVISION with LIMIT != 1.

Fixes: debbugs:14168
 2013-04-24 00:59:29 -07:00
Glenn Morris
bb7cdf58f6 Doc fixes related to vc-print-log 
* vc/vc-bzr.el (vc-bzr-print-log):
* vc/vc-cvs.el (vc-cvs-print-log):
* vc/vc-git.el (vc-git-print-log):
* vc/vc-hg.el (vc-hg-print-log):
* vc/vc-mtn.el (vc-mtn-print-log):
* vc/vc-rcs.el (vc-rcs-print-log):
* vc/vc-sccs.el (vc-sccs-print-log):
* vc/vc-svn.el (vc-svn-print-log):
* vc/vc.el (vc-print-log-internal): Doc fixes.
 2013-04-24 00:52:00 -07:00
Glenn Morris
1b42ee4390 vc.el doc fixes 
* lisp/vc/vc.el (vc-print-log-setup-buttons, vc-print-log-internal):
Add doc strings.
(vc-print-log): Clarify interactive prompt.
 2013-04-20 17:37:54 -07:00
Stefan Monnier
bcd7a0a4c5 Use add/remove-function to manipulate process-filters. 
* lisp/emacs-lisp/nadvice.el (advice--where-alist): Add :override.
(remove-function): Autoload.

* lisp/comint.el (comint-redirect-original-filter-function): Remove.
(comint-redirect-cleanup, comint-redirect-send-command-to-process):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-process-filter,vc-cvs-annotate-command):
* lisp/progmodes/octave-inf.el (inferior-octave-send-list-and-digest):
* lisp/progmodes/prolog.el (prolog-consult-compile):
* lisp/progmodes/gdb-mi.el (gdb, gdb--check-interpreter):
Use add/remove-function instead.
* lisp/progmodes/gud.el (gud-tooltip-original-filter): Remove.
(gud-tooltip-process-output, gud-tooltip-tips):
Use add/remove-function instead.
* lisp/progmodes/xscheme.el (xscheme-previous-process-state): Remove.
(scheme-interaction-mode, exit-scheme-interaction-mode):
Use add/remove-function instead.

* lisp/vc/vc-dispatcher.el: Use lexical-binding.
(vc--process-sentinel): Rename from vc-process-sentinel.
Change last arg to be the code to run.  Don't use vc-previous-sentinel
and vc-sentinel-commands any more.
(vc-exec-after): Allow code to be a function.  Use add/remove-function.
(compilation-error-regexp-alist, view-old-buffer-read-only): Declare.
 2013-04-20 12:24:04 -04:00
Stefan Monnier
31dcede0c7 * lisp/vc/vc-dispatcher.el (vc-do-command): Get rid of default sentinel msg. 2013-04-19 00:09:08 -04:00
Stefan Monnier
2d3fa3e502 * lisp/vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names. 
Fixes: debbugs:14216
 2013-04-16 20:50:44 -04:00
Leo Liu
f67bfbcfc0 * vc/vc-bzr.el (vc-bzr-revert): Don't backup. 
Fixes: debbugs:14066
 2013-03-28 11:26:37 +08:00
Dmitry Gutov
b3082f497c * lisp/vc/diff-mode.el (diff-mode-shared-map): Unbind "/". 
Fixes: debbugs:14034
 2013-03-23 21:43:18 +04:00
Sam Steingold
3602ccebf6 * lisp/vc/diff-mode.el (diff-hunk-file-names): Handle filenames with spaces. 
See <http://stackoverflow.com/questions/14720205>.
 2013-02-28 11:34:51 -05:00
Glenn Morris
e8ba235206 Add bug-gnu-emacs to some specialized bug report addresses 
* emulation/viper-cmd.el (viper-submit-report):
* progmodes/ps-mode.el (ps-mode-maintainer-address):
* progmodes/vera-mode.el (vera-mode-help-address):
* textmodes/artist.el (artist-maintainer-address):
* textmodes/reftex.el (reftex-report-bug):
* vc/ediff-util.el (ediff-submit-report):
Add bug-gnu-emacs to bug report address.
 2013-02-23 13:54:00 -08:00
Juri Linkov
ef79c6ed07 * vc/ediff-util.el (ediff-recenter): Use `select-frame-set-input-focus' 
to select `ediff-control-frame' and set input focus correctly on Xfce.

Fixes: debbugs:12218
 2013-02-13 10:41:56 +02:00
Juri Linkov
9cec74cfd7 Add more keymaps where S-SPC scrolls in the opposite direction to SPC. 
* lisp/image-mode.el (image-mode-map):
* lisp/doc-view.el (doc-view-mode-map):
* lisp/vc/ediff-util.el (ediff-setup-keymap):
Make S-SPC scroll in the opposite sense to SPC. 

* lisp/gnus/gnus-art.el (gnus-article-mode-map):
* lisp/gnus/gnus-sum.el (gnus-summary-mode-map, gnus-summary-article-map):
Make S-SPC scroll in the opposite sense to SPC.  (Bug#2145)
 2013-02-13 10:28:47 +02:00
Glenn Morris
5109429f09 Check whether diff supports --label before using it 
* lisp/vc/diff.el (diff-use-labels): New variable.
(diff-no-select): Use --label rather than -L, and first
check that it is supported.

Fixes: debbugs:11067
 2013-02-11 00:28:08 -08:00
Glenn Morris
31db8c31fd * vc/vc-svn.el (vc-svn-command): Move --non-interactive from here... 
(vc-svn-global-switches): ... to here.

Fixes: debbugs:13513
 2013-02-10 17:07:05 -08:00
Michael Albinus
fed000725c * vc/vc-hooks.el (vc-find-file-hook): `buffer-file-truename' can 
be nil.  Handle this.  (Bug#13636)
 2013-02-07 09:50:04 +01:00
Glenn Morris
5fd03926b3 * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links 
if we can't get user input.

Fixes: debbugs:6567
 2013-02-06 00:27:41 -08:00
Thierry Volpiatto
50fdf39987 * lisp/vc/vc.el (vc-next-action): Fix inf-loop. 
(vc-update-change-log): Use dolist.

Fixes: debbugs:13610
 2013-02-04 16:23:15 -05:00
Christopher Schmidt
af314ba001 * vc/vc-arch.el (vc-arch-registered): 
* vc/vc-bzr.el (vc-bzr-registered):
* vc/vc-cvs.el (vc-cvs-registered):
* vc/vc-git.el (vc-git-registered):
* vc/vc-hg.el (vc-hg-registered):
* vc/vc-mtn.el (vc-mtn-registered):
* vc/vc-svn.el (vc-svn-registered): Suppress load messages.
(Bug#13139)
 2013-02-01 18:19:24 +01:00
Glenn Morris
1f4f0f46bd * vc/vc-hooks.el (vc-menu-map): Disable vc-rollback menu item 
if the backend is known not to support it.
 2013-02-01 00:44:10 -08:00
Stefan Monnier
a07846093f * lisp/vc/vc-bzr.el (vc-bzr--sanitize-header): New function. 
(vc-bzr-checkin): Use it.
* lisp/vc/log-edit.el (log-edit-extract-headers): Don't presume FUNCTION
will preserve match-data.

Fixes: debbugs:13307
 2013-01-11 22:15:14 -05:00
Aaron S. Hawley
9fc9a531a5 Disambiguate function and variable references in docstrings. 
* lisp/comint.el (comint-history-isearch-message): Fix ambiguous doc
 string cross-reference(s).

* lisp/ffap.el (ffap-string-at-point-region, ffap-next)
(ffap-string-at-point, ffap-string-around)
(ffap-copy-string-as-kill, ffap-highlight-overlay)
(ffap-literally): Fix ambiguous doc string cross-reference(s).

* lisp/font-lock.el (font-lock-keywords-alist)
(font-lock-removed-keywords-alist): Fix ambiguous doc string
        cross-reference(s).

* lisp/help-mode.el (help-xref-symbol-regexp): Add "call" as a hint for
a cross-reference to a function.

* lisp/info.el (Info-find-emacs-command-nodes): Fix ambiguous doc
 string cross-reference(s).

* lisp/isearch.el (isearch-message-function, isearch-fail-pos): Fix
 ambiguous doc string cross-reference(s).

* lisp/misearch.el (multi-isearch-next-buffer-function): Fix ambiguous
 doc string cross-reference(s).

* lisp/newcomment.el (comment-box): Fix ambiguous doc string
 cross-reference(s).

* lisp/printing.el (pr-txt-printer-alist, pr-ps-printer-alist)
(pr-setting-database): Fix ambiguous doc string
 cross-reference(s).

* lisp/ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces)
(ps-n-up-filling-database): Fix ambiguous doc string
 cross-reference(s).

* lisp/server.el (server-buffer, server-log): Fix ambiguous doc string
 cross-reference(s).

* lisp/simple.el (newline, delete-backward-char, delete-forward-char)
(minibuffer-history-isearch-message, kill-line, track-eol)
(temporary-goal-column): Fix ambiguous doc string
 cross-reference(s).

* lisp/whitespace.el (whitespace-point)
(whitespace-font-lock-refontify, whitespace-bob-marker)
(whitespace-eob-marker): Fix ambiguous doc string
 cross-reference(s).

* lisp/calc/calc.el (calc-highlight-selections-with-faces)
 (calc-dispatch): Fix ambiguous doc string cross-reference(s).

* lisp/emacs-lisp/edebug.el (edebug-read, edebug-eval-defun): Fix
 ambiguous doc string cross-reference(s).

* lisp/gnus/gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
 cross-reference(s).

* lisp/gnus/gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string
 cross-reference(s).

* lisp/international/mule.el (add-to-coding-system-list): Fix ambiguous
 doc string cross-reference(s).

* lisp/progmodes/cc-fonts.el (c-font-lock-keywords-3)
(c++-font-lock-keywords-3, objc-font-lock-keywords-3)
(java-font-lock-keywords-3, idl-font-lock-keywords-3)
(pike-font-lock-keywords-3): Fix ambiguous doc string
 cross-reference(s).

* lisp/progmodes/compile.el (compile): Fix ambiguous doc string
 cross-reference(s).

* lisp/progmodes/etags.el (tags-table-files)
(tags-table-files-function, tags-included-tables-function): Fix
 ambiguous doc string cross-reference(s).

* lisp/progmodes/gdb-mi.el (gdb, gdb-setup-windows)
(gdb-restore-windows): Fix ambiguous doc string
 cross-reference(s).

* lisp/textmodes/flyspell.el (flyspell-mark-duplications-flag)
(flyspell-default-deplacement-commands): Fix ambiguous doc string
 cross-reference(s).

* lisp/textmodes/ispell.el (ispell-accept-output): Fix ambiguous doc
 string cross-reference(s).

* lisp/textmodes/sgml-mode.el (html-tag-help): Fix ambiguous doc string
 cross-reference(s).

* lisp/vc/compare-w.el (compare-ignore-whitespace)
(compare-ignore-case, compare-windows-dehighlight): Fix ambiguous
 doc string cross-reference(s).

* lisp/vc/diff.el (diff): Fix ambiguous doc string cross-reference(s).

* src/insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix
 ambiguous doc string cross-reference(s).

* src/keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous
 doc string cross-reference(s).

* src/window.c (Fwindow_point, syms_of_window): Fix ambiguous doc
 string cross-reference(s).

Fixes: debbugs:12686
 2013-01-11 18:08:55 -05:00
Stefan Monnier
1c851e98b6 * lisp/vc/pcvs.el (cvs-cleanup-collection): Extend meaning of `rm-handled'. 
(cvs-mode-remove-handled): Use it.

Fixes: debbugs:13380
 2013-01-08 12:34:35 -05:00
Chong Yidong
58ba7b1b55 Try to handle buffer/file modifications which conflict with VCS locking. 
* vc/vc-hooks.el (vc-after-save): DTRT for locking VCSes.

* vc/vc.el (vc-next-action): Detect buffer modifications
conflicting with locking VCS operation.

Fixes: debbugs:11490
 2013-01-06 10:58:57 +08:00
Paul Eggert
0877d0dc24 Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca 2013-01-02 08:13:04 -08:00
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Glenn Morris
b83a2ddd47 * lisp/vc/log-edit.el (log-edit-header-contents-regexp): Add doc string. 2012-12-31 12:13:28 -08:00
Dmitry Antipov
87523aedc8 * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'. 
Adjust comment.
 2012-12-20 09:05:41 +04:00
Stefan Monnier
f4d79bd021 * lisp/vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the 
very beginning of a hunk (e.g. killing the first line).
 2012-12-19 14:41:43 -05:00
Dave Abrahams
665e5e07a9 * lisp/vc/ediff-util.el (ediff-buffer-type): New function. 
(ediff-clone-buffer-for-current-diff-comparison): Compute the buf-type
rather than taking it as as argument.
(ediff-inferior-compare-regions): Adjust calls accordingly.

Fixes: debbugs:11319
 2012-12-14 10:22:24 -05:00
Glenn Morris
265c2fbf11 Merge from emacs-24; up to 2012-11-26T19:56:14Z!monnier@iro.umontreal.ca 2012-12-09 18:00:42 -08:00
Juanma Barranquero
bf741d337c lisp/vc/vc-hooks.el (vc-state): Doc fix. 2012-12-07 04:55:40 +01:00
Glenn Morris
49596095d0 Add conflict detection/resolution to vc-hg (bug#10709) 
* lisp/vc/vc-hg.el (vc-hg-resolve-when-done, vc-hg-find-file-hook):
New functions, for detecting and resolving conflicts.
 2012-12-04 20:49:31 -05:00
Chong Yidong
770de7cf72 Obsolete longlines.el. 
* longlines.el: Move to obsolete/.

* lisp/org/org-bibtex.el (org-bibtex-ask): Use visual-line-mode instead of
longlines-mode.

* lisp/vc/ediff-diff.el (ediff-extract-diffs, ediff-extract-diffs3):
Remove code referring to longlines mode.
 2012-12-04 10:47:43 +08:00
Dmitry Gutov
db47d5e975 * lisp/vc/vc.el (vc-delete-file, vc-rename-file): Default to the 
current buffer's file name when called interactively.

Fixes: debbugs:12488
 2012-12-03 01:12:31 +04:00
Yuya Nishihara
cb5d51dc07 Fix use of buffer-file-truename in vc-find-file-hook (tiny change). 
* lisp/vc/vc-hooks.el (vc-find-file-hook): Expand buffer-file-truename
before using it for comparison.

Fixes: debbugs:5297
 2012-12-01 21:25:13 +08:00
Chong Yidong
ba03d0d932 Modularize add-log-current-defun. 
Suggested by Jari Aalto.

* lisp/emacs-lisp/lisp-mode.el (lisp-current-defun-name): New.
(lisp-mode-variables): Use it.

* lisp/progmodes/cc-mode.el (c-common-init):
* lisp/progmodes/cperl-mode.el (cperl-mode): Set a value for
add-log-current-defun-function.

* lisp/progmodes/m4-mode.el (m4-current-defun-name): New function.
(m4-mode): Use it.

* lisp/progmodes/perl-mode.el (perl-current-defun-name): New.
(perl-mode): Use it.

* lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode): Use
lisp-current-defun-name.

* lisp/textmodes/tex-mode.el (tex-current-defun-name): New.
(tex-common-initialization): Use it.

* lisp/textmodes/texinfo.el (texinfo-current-defun-name): New.
(texinfo-mode): Use it.

* lisp/vc/add-log.el (add-log-current-defun-function): Doc fix.
(add-log-current-defun): Move mode-specific code to other files.
(add-log-lisp-like-modes, add-log-c-like-modes)
(add-log-tex-like-modes): Variables deleted.

Fixes: debbugs:2224
 2012-12-01 12:57:07 +08:00
Kirk Kelsey
3ddbf80375 * vc-hg.el (vc-hg-next-revision): Ensure use of default "tip" output format 
Fixes: debbugs:6968
 2012-11-30 21:10:53 -05:00
Chong Yidong
a8b733a519 * vc/vc-git.el (vc-git-command): Disable the pager. 
Fixes: debbugs:6137
 2012-11-30 15:43:05 +08:00
OKAZAKI Tetsurou
171b09490b Relax existing-registration check in vc-register (tiny change). 
* vc/vc.el (vc-register): Allow registering a file which is already
registered with a different backend.

Fixes: debbugs:10589
 2012-11-30 12:44:52 +08:00