mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity
115206 commits 242 branches 194 tags 7.7 GiB
Commit graph

424 commits

Author SHA1 Message Date
Glenn Morris
5bcad689ca * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs): 
Do not use ediff-defvar-local on pre-defined variables.

Fixes: debbugs:16744
 2014-02-15 19:09:27 -08:00
Glenn Morris
34dc21db6e Replace "Maintainer: FSF" with the emacs-devel mailing address 2014-02-09 17:34:22 -08:00
Andreas Schwab
c1b5900bc0 Fixes: debbugs:16690 
* vc/log-edit.el (log-edit-comment-to-change-log): Doc fix.
 2014-02-09 00:01:45 +01:00
Glenn Morris
6a6b8e405e Be more consistent in using register-read-with-preview to read registers 
* frameset.el (frameset-to-register):
* kmacro.el (kmacro-to-register):
* register.el (increment-register):
* calc/calc-yank.el (calc-copy-to-register, calc-insert-register)
(calc-append-to-register, calc-prepend-to-register):
* play/gametree.el (gametree-layout-to-register)
(gametree-apply-register-layout):
* textmodes/picture.el (picture-clear-rectangle-to-register)
(picture-yank-rectangle-from-register):
* vc/emerge.el (emerge-combine-versions-register):
Use register-read-with-preview to read registers.

* cedet/semantic/senator.el (senator-copy-tag-to-register):
Use register-read-with-preview, if available.

* calculator.el, emulation/viper-cmd.el: Comments.
 2014-02-02 16:40:49 -08:00
Glenn Morris
a22359a767 * lisp/vc/pcvs.el (cvs-append-to-ignore): Add compatibility alias. 
(vc-editable-p, vc-checkout): Remove unused declarations.

* etc/NEWS: Small edits.
 2014-01-27 19:39:50 -05:00
Glenn Morris
85a5f61f29 * lisp/vc/vc-git.el (vc-git-print-log): Remove --follow; 
reverts 2014-01-09 change.

Fixes: debbugs:16422
 2014-01-21 21:01:40 -05:00
Stefan Monnier
c055d65460 * lisp/vc/log-edit.el: Fix highlighting of summary when it's the first line. 
(log-edit--match-first-line): New function.
(log-edit-font-lock-keywords): Use it.
(log-edit-mode): Make jit-lock-defer-multiline work.
 2014-01-13 10:33:01 -05:00
Eric S. Raymond
f29778b343 Minor bug fix. 
Fixes: debbugs:8756
 2014-01-09 11:46:56 -05:00
Daniel Colascione
ee916ed038 Explain recent change to log-view.el 2014-01-06 22:00:16 -08:00
Daniel Colascione
bf6a77f31c Fix defun navigation in vc log view. 2014-01-05 23:33:06 -08:00
Paul Eggert
ba3189039a Update copyright year to 2014 by running admin/update-copyright. 2014-01-01 07:43:34 +00:00
Glenn Morris
9c5a5c7700 Every defcustom should specify its type 
* apropos.el (apropos-match-face):
* calculator.el (calculator-displayer):
* dabbrev.el (dabbrev-search-these-buffers-only):
* face-remap.el (buffer-face-mode-face):
* simple.el (yank-handled-properties):
* emacs-lisp/testcover.el (testcover-potentially-1value-functions):
* mail/footnote.el (footnote-mode-line-string, footnote-prefix):
* mail/hashcash.el (hashcash-accept-resources, hashcash-program)
(hashcash-double-spend-database):
* progmodes/ruby-mode.el (ruby-deep-indent-paren)
(ruby-deep-indent-paren-style):
* textmodes/flyspell.el (flyspell-auto-correct-binding):
* textmodes/rst.el (rst-toc-indent, rst-toc-insert-style)
(rst-toc-insert-number-separator, rst-toc-insert-max-level):
* vc/pcvs-defs.el (cvs-minor-mode-prefix):
* erc/erc-log.el (erc-log-file-coding-system):
* gnus/gnus-sieve.el (gnus-sieve-select-method):
* gnus/gravatar.el (gravatar-automatic-caching, gravatar-cache-ttl)
(gravatar-rating, gravatar-size):
* gnus/message.el (message-minibuffer-local-map):
* gnus/sieve-manage.el (sieve-manage-authenticators)
(sieve-manage-authenticator-alist):
Specify custom types.

* mail/hashcash.el (hashcash-program): Rename from hashcash-path.
Update callers.
 2013-12-28 00:21:33 -08:00
Glenn Morris
bb0980751e Add missing custom :versions, plus small fixes 
* emacs-lisp/smie.el (smie-config): Add type, version, initialize.

* bookmark.el (bookmark-bmenu-use-header-line):
* doc-view.el (doc-view-scale-internally):
* pcmpl-x.el (pcmpl-x-tlmgr-program, pcmpl-x-ack-program):
* register.el (register-preview-delay):
* net/shr.el (shr-bullet):
* progmodes/cfengine.el (cfengine-cf-promises)
(cfengine-parameters-indent):
* progmodes/octave.el (inferior-octave-error-regexp-alist):
* textmodes/reftex-vars.el (reftex-label-regexps):
* vc/log-edit.el (log-edit-setup-add-author): Add version.

* cedet/ede/linux.el (project-linux-build-directory-default)
(project-linux-architecture-default): Fix custom types.  Add version.

* gnus/gnus-icalendar.el (gnus-icalendar-org, gnus-icalendar):
* gnus/gnus-sum.el (gnus-subthread-sort-functions): Add version.
* gnus/gnus-sync.el (gnus-sync-file-encrypt-to): Add type and version.
 2013-12-27 18:16:05 -08:00
Xue Fuqiao
3bc1e1880f Some fixes for vc-ignore (Bug#15754). 
Inspired by Andreas Politz and Dmitry Gutov.
 2013-12-26 06:24:37 +08:00
Juri Linkov
3d6e95e767 * lisp/vc/log-edit.el (log-edit-insert-filenames-without-changelog): New function. 
(log-edit-hook): Add it to :options.

Fixes: debbugs:16170
 2013-12-19 23:10:41 +02:00
Juri Linkov
0cda6b7b13 * lisp/vc/log-edit.el (log-edit-hook): Add `log-edit-insert-message-template' 
to the default list.  Move `log-edit-show-files' to the end.
Add more available functions to options.
(log-edit): Move default specific settings to
`log-edit-insert-message-template'.  Don't move point.
(log-edit-insert-message-template): New function.
(log-edit-insert-changelog): Add `save-excursion' and don't move point.

Fixes: debbugs:16170
 2013-12-19 01:51:45 +02:00
Juanma Barranquero
0cd616a2d8 * vc/vc-git.el: Silence byte-compiler warnings. 
(vc-git-dir-extra-headers): Rename arg _dir which is no longer ignored.
(log-edit-set-header): Declare.
 2013-12-11 18:10:22 +01:00
Dmitry Gutov
dda6191643 Remember log-edit comment when the buffer is killed 
* lisp/vc/log-edit.el (log-edit-add-new-comment): Rename to
`log-edit-remember-comment', make argument optional.  Adjust all
callers.
(log-edit-mode): Add `log-edit-remember-comment' to
`kill-buffer-hook' locally.
(log-edit-kill-buffer): Don't remember comment explicitly since
the buffer is killed anyway.
 2013-12-04 02:37:33 +02:00
Dmitry Gutov
0f457a371c Support the new log-edit behavior in vc-git-log-edit-toggle-amend 
* lisp/vc/log-edit.el (log-edit-set-header): Extract from
`log-edit-toggle-header'.
(log-edit-extract-headers): Separate the summary, when extracted
from header, from the rest of the message with an empty line.

* lisp/vc/vc-git.el (vc-git-log-edit-toggle-amend): Move the summary
line, if present, to the Summary header.
 2013-12-03 00:13:51 +02:00
Dmitry Gutov
3adc9c6dca Fix minor log-edit-show-files annoyances 
* lisp/vc/log-edit.el (log-edit-kill-buffer): Move the use of
`save-selected-window' to `log-edit-hide-buf'.  This makes
`log-edit-show-files' idempotent.
(log-edit-show-files): Mark the new window as dedicated.
 2013-12-02 05:03:40 +02:00
Dmitry Gutov
d9dfe8ca07 Install the actual changes missing in previous revision 
* lisp/vc/log-edit.el (log-edit-mode-map): Add binding for
`log-edit-kill-biffer'.
(log-edit-hide-buf): Add a FIXME comment.
(log-edit-add-new-comment): New function, extracted from
`log-edit-done'.
(log-edit-done, log-edit-add-to-changelog): Use it.
(log-edit-kill-buffer): New command.
 2013-12-02 04:26:07 +02:00
Dmitry Gutov
52789f7fb3 Apply the initial log-edit tweaks discussed at emacs-devel 
* .dir-locals.el: (log-edit-move): Add the "Author: " header.

* lisp/vc/log-edit.el (log-edit-mode-map): Add binding for
`log-edit-beginning-of-line'.
(log-edit-setup-add-author): New user option.
(log-edit-beginning-of-line): New command.
(log-edit): Move major mode call above the contents setup so that
the local variable values are already applied.
(log-edit): Only insert "Author: " when
`log-edit-setup-add-author' is non-nil.
(log-edit): When SETUP is non-nil, position point after ": "
instead of point-min.
 2013-12-01 06:13:50 +02:00
Stefan Monnier
1b10adb682 * lisp/vc/vc-dispatcher.el (vc-log-edit): Setup the Summary&Author headers. 2013-11-27 20:49:25 -05:00
Eli Zaretskii
0e2c793ffe Fix ugly ^M characters in Diff output shown by "C-x v u". 
lisp/vc/vc.el (vc-diff-internal): Use *-dos coding-system when
 reading output from Diff on MS-Windows and MS-DOS.
 2013-11-26 21:17:55 +02:00
David Kastrup
5f5b128d48 * lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based 
on the conflict markers when available.
(smerge--get-marker): New function.
(smerge-end-re, smerge-base-re): Add subgroup.
 2013-11-25 10:40:31 -05:00
Dmitry Gutov
6f20dd038e * lisp/vc/vc-git.el (vc-git-annotate-extract-revision-at-line): Make it 
work when annotation is invisible.

Fixes: debbugs:13886
 2013-11-25 04:28:02 +02:00
Ivan Shmakov
e1b01c7fed * vc/diff-mode.el (diff-mode): Tiny change re diff-default-read-only 
Only allow diff-default-read-only to set buffer-read-only to t, never to nil.

Fixes: debbugs:15938
 2013-11-22 18:55:17 -08:00
Dan Nicolaescu
826dc7b6b1 * vc/vc-git.el (vc-git-dir-extra-headers): Add headers 
when rebase or bisect are in progress.
 2013-11-19 15:23:53 -05:00
Glenn Morris
75f777b647 * lisp/vc/vc.el (vc-diff-knows-L): Remove; unused since 2007-10-10. 2013-11-13 15:06:37 -05:00
Stefan Monnier
0acfafef3a * lisp/vc/vc-rcs.el (vc-rcs-parse): Make `gather' get e, b, and @-holes 
via arguments so as to get the right ones.

Fixes: debbugs:15418
 2013-11-05 10:27:51 -05:00
Glenn Morris
cecedb3677 * lisp/vc/pcvs.el (cvs-status-cvstrees): Autoload to silence compiler. 2013-10-29 23:28:15 -07:00
Glenn Morris
f5bf77dfae * lisp/vc/vc.el (vc-print-log): Don't use a working revision unless 
one was explicitly specified.

Fixes: debbugs:15322
 2013-10-24 19:33:42 -07:00
Dmitry Gutov
8297b2cfdd * lisp/vc/vc.el (vc-print-root-log): Always set `default-directory' 
value, whether we could auto-deduce `backend', or not.
 2013-10-24 05:27:29 +04:00
João Távora
db1386987b * vc/vc.el (vc-diff-build-argument-list-internal): If the file is 
not locked, use last revision and current source as
defaults.  (Bug#15569)
 2013-10-10 10:59:09 -04:00
Glenn Morris
14afa541a6 * lisp/vc/vc-svn.el (vc-svn-create-repo): Expand paths in file://... url. 
Fixes: debbugs:15446
 2013-10-09 14:49:32 -04:00
Stefan Monnier
cc5da1ec4d * lisp/vc/pcvs.el: Use lexical-binding. 
(cvs-temp-buffer, cvs-make-cvs-buffer): Pass some vars in the lexical
environment of `eval'.
(cvs-mode-run, cvs-mode-do): Change `postproc' to be a function rather
than a list of expressions.  Adjust callers.
* lisp/vc/pcvs-defs.el (cvs-postprocess): Remove, unused.
 2013-10-07 23:47:24 -04:00
Xue Fuqiao
34ca0f4c79 New functions for finding the administrative directory in VC. 
* vc/vc-svn.el (vc-svn-find-admin-dir):
* vc/vc-rcs.el (vc-rcs-find-admin-dir):
* vc/vc-mtn.el (vc-mtn-find-admin-dir):
* vc/vc-cvs.el (vc-cvs-find-admin-dir):
* vc/vc-arch.el (vc-arch-find-admin-dir): New functions.
 2013-10-05 07:47:00 +08:00
Mitchel Humpherys
be4e325d03 * lisp/vc/vc-git.el (vc-git-grep): Disable pager. 2013-10-01 11:34:14 -04:00
Juanma Barranquero
c8af4e673e lisp/vc/vc-sccs.el (vc-sccs-search-project-dir): Mark unused argument. 2013-09-23 04:59:30 +02:00
Xue Fuqiao
d052d3bdf3 Add keybinding for vc-log-incoming in vc-dir. 
* doc/emacs/maintaining.texi (VC Directory Commands): Add keybinding for
vc-log-incoming in vc-dir.
* lisp/vc/vc-dir.el (vc-dir-mode-map): Add keybinding for vc-log-incoming.
 2013-09-21 16:16:13 +08:00
Xue Fuqiao
98ccf24eab Rename cvs-append-to-ignore to vc-cvs-append-to-ignore. 
2013-09-20  Xue Fuqiao  <xfq.free@gmail.com>

	* lisp/vc/pcvs.el (cvs-mode-ignore):
	* lisp/vc/vc-cvs.el (vc-cvs-ignore, vc-cvs-append-to-ignore): Rename
	cvs-append-to-ignore to vc-cvs-append-to-ignore.

If/when someone complains about her package calling that function we
can add an obsolete alias at that point.
 2013-09-20 13:39:53 +08:00
Glenn Morris
dea01c6e98 * vc/vc-dispatcher.el (vc-dir-refresh): Declare. 2013-09-11 23:58:57 -07:00
Glenn Morris
aa30fa6f3a * vc/vc-svn.el (vc-svn-retrieve-tag): Mark unused argument. 2013-09-11 23:55:15 -07:00
Glenn Morris
be94d71300 * vc/vc-svn.el (vc-svn-dir-status-files, vc-svn-dir-extra-headers) 
(vc-svn-ignore): Mark unused arguments.
 2013-09-11 23:53:57 -07:00
Glenn Morris
759880bff7 Revert part of previous vc-bzr change 2013-09-11 23:50:18 -07:00
Glenn Morris
a6ae021fd3 * vc/vc-svn.el (vc-svn-parse-status): If there are multiple files 
in the status output, assume `filename' is the first.

Fixes: debbugs:15322
 2013-09-11 23:21:33 -07:00
Glenn Morris
40e64f0cbd * lisp/vc/vc.el (vc-deduce-fileset): Doc fix. 2013-09-11 23:10:12 -07:00
Glenn Morris
16d9f8966f Update some function declarations 
* calc/calc-help.el (Info-goto-node):
* progmodes/cperl-mode.el (Info-find-node):
* vc/ediff.el (Info-goto-node): Update declarations.
 2013-09-11 22:48:22 -07:00
Glenn Morris
96b3f75a80 Silence some vc- compilation warnings 
* vc/vc-bzr.el (vc-exec-after): Remove unused declaration.
(vc-compilation-mode): Declare.
(vc-bzr-pull): Require vc-dispatcher.

* vc/vc-git.el (vc-compilation-mode): Declare.
(vc-git-pull): Require vc-dispatcher.
 2013-09-11 22:45:42 -07:00
Glenn Morris
aab6e902f9 Comment 2013-09-11 14:40:06 -04:00