procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
132656 commits 1 branch 0 tags 938 MiB
Commit graph

851 commits

Author SHA1 Message Date
Paul Eggert
09e80d9fb9 Spelling fixes. 2011-11-13 22:27:12 -08:00
Glenn Morris
9a4de11022 Always use svn --non-interactive in vc-svn.el (bug#9993) 
* lisp/vc/vc-svn.el (vc-svn-create-repo, vc-svn-modify-change-comment):
Call svn via vc-svn-command rather than vc-do-command.
(vc-svn-command): Add --non-interactive.
(vc-svn-update, vc-svn-merge-news): No need for --non-interactive.
 2011-11-09 21:36:48 -05:00
Juanma Barranquero
db22a3c27b Fix typos. 2011-11-02 03:05:53 +01:00
Juanma Barranquero
ebe06da995 Fix bug#9935 
* lisp/vc/vc-bzr.el: Accept status with more than 9 shelves.
  Reported by Colin D Bennett <colin@gibibit.com>.
 2011-11-02 02:58:59 +01:00
Chong Yidong
2d197ffbe2 Rename split-window-{above-each-other|split-window-side-by-side} 
to split-window-below and split-window-right.

* lisp/window.el (split-window-below, split-window-right): Rename from
split-window-above-each-other and split-window-side-by-side
respectively.  All callers changed.
(split-window-sensibly, split-window-sensibly): Use them.
(split-window-keep-point): Doc fix.

* lisp/isearch.el: Add isearch-scroll property to split-window-below
and split-window-right.

* lisp/follow.el (follow-mode):
* lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame):
* lisp/progmodes/ada-xref.el (ada-gdb-application):
* lisp/emulation/vip.el (vip-buffer-in-two-windows):
* lisp/image-dired.el (image-dired-dired-with-window-configuration):
* lisp/dired-x.el (dired-do-find-marked-files):
* lisp/dired.el (dired-pop-to-buffer):
* lisp/bs.el (bs--show-with-configuration):
* lisp/vc/emerge.el (emerge-setup-windows):
* lisp/textmodes/two-column.el (2C-two-columns):
* lisp/textmodes/reftex-toc.el (reftex-toc):
* lisp/progmodes/gdb-mi.el (gdb-setup-windows):
* lisp/progmodes/fortran.el (fortran-window-create):
* lisp/net/newst-treeview.el (newsticker--treeview-window-init):
* lisp/emulation/ws-mode.el (wordstar-C-o-map, wordstar-mode):
* lisp/emulation/tpu-edt.el (tpu-gold-map):
* lisp/emulation/crisp.el (crisp-mode-map):
* lisp/calendar/calendar.el (calendar-basic-setup): Callers changed.
 2011-10-30 09:56:03 +08:00
Stefan Monnier
7a6c094174 * lisp/vc/log-edit.el: Fill empty field rather than adding new one. 
(log-edit-add-field): New function.
(log-edit-insert-changelog): Use it.
 2011-10-27 22:50:05 -04:00
Chong Yidong
86c6068184 Make vc-toggle-read-only an alias for toggle-read-only. 
It hasn't worked in a VC sense since 2008-05-02T07:12:59Z!esr@snark.thyrsus.com, though this was
not documented at the time (grr).

* lisp/vc/vc-hooks.el (vc-toggle-read-only): Make it an obsolete alias
for toggle-read-only.  Note that this hasn't called vc-next-action
since 2008-05-02, though it wasn't documented at the time.

* lisp/files.el (toggle-read-only): Remove obsolete comment about
version control.

* doc/emacs/buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only.

* lisp/cedet/ede.el (ede-maybe-checkout): Function deleted;
vc-toggle-read-only does not do version control now.

* lisp/cedet/ede/project-am.el (project-remove-file, project-add-file)
(project-new-target): Don't call ede-maybe-checkout.

* lisp/cedet/ede/util.el (ede-make-buffer-writable): Don't use
vc-toggle-read-only.

* lisp/vc/ediff-init.el (ediff-toggle-read-only-function): Use
toggle-read-only.
 2011-10-23 11:38:23 +08:00
Glenn Morris
516eddb051 * lisp/vc/vc.el (vc-next-action): Handle removed directories. (Bug#9781) 2011-10-20 17:01:45 -04:00
Chong Yidong
ac6c8639bd Fix more minor mode docstrings. 
* lisp/emulation/cua-base.el (cua-mode):
* lisp/mail/footnote.el (footnote-mode):
* lisp/mail/mailabbrev.el (mail-abbrevs-mode):
* lisp/net/xesam.el (xesam-minor-mode):
* lisp/progmodes/bug-reference.el (bug-reference-mode):
* lisp/progmodes/cap-words.el (capitalized-words-mode):
* lisp/progmodes/compile.el (compilation-minor-mode)
(compilation-shell-minor-mode):
* lisp/progmodes/gud.el (gud-tooltip-mode):
* lisp/progmodes/hideif.el (hide-ifdef-mode):
* lisp/progmodes/idlw-shell.el (idlwave-shell-electric-debug-mode):
* lisp/progmodes/subword.el (subword-mode):
* lisp/progmodes/vhdl-mode.el (vhdl-electric-mode, vhdl-stutter-mode):
* lisp/progmodes/which-func.el (which-function-mode):
* lisp/term/tvi970.el (tvi970-set-keypad-mode):
* lisp/term/vt100.el (vt100-wide-mode):
* lisp/textmodes/flyspell.el (flyspell-mode):
* lisp/textmodes/ispell.el (ispell-minor-mode):
* lisp/textmodes/nroff-mode.el (nroff-electric-mode):
* lisp/textmodes/paragraphs.el (use-hard-newlines):
* lisp/textmodes/refill.el (refill-mode):
* lisp/textmodes/reftex.el (reftex-mode):
* lisp/textmodes/rst.el (rst-minor-mode):
* lisp/textmodes/sgml-mode.el (html-autoview-mode)
(sgml-electric-tag-pair-mode):
* lisp/textmodes/tex-mode.el (latex-electric-env-pair-mode):
* lisp/vc/diff-mode.el (diff-auto-refine-mode, diff-minor-mode):
* lisp/emulation/crisp.el (crisp-mode):
* lisp/emacs-lisp/eldoc.el (eldoc-mode):
* lisp/emacs-lisp/checkdoc.el (checkdoc-minor-mode): Doc fixes for new
minor mode behavior.

* lisp/erc/erc-fill.el (erc-fill-mode):
* lisp/erc/erc-track.el (erc-track-minor-mode): Doc fix.

* lisp/erc/erc.el (define-erc-module): Fix autogenerated docstring to
reflect Emacs 24 minor mode changes.

* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24,
calling a minor mode from Lisp with nil arg enables it, so we have to
make the working a bit ambiguous here).
 2011-10-19 20:26:14 -04:00
Stefan Monnier
89400f1da2 * vc/log-edit.el (log-edit-empty-buffer-p): Ignore empty headers. 2011-10-19 17:43:41 -04:00
Glenn Morris
13754b5435 * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Ignore ignored files. 
Fixes: debbugs:9726
 2011-10-19 09:42:20 -07:00
Stefan Monnier
6978a1514a * lisp/vc/log-edit.el (log-edit): Add "Author:" header to encourage people 
to distinguish the author from the committer.
 2011-10-18 09:38:09 -04:00
Glenn Morris
80c6d77f2d Doc fixes related to vc-initial-comment. 
* doc/emacs/maintaining.texi (Registering): Remove vc-initial-comment. 

* lisp/vc/vc.el (vc-initial-comment): Mark as obsolete.

* lisp/ChangeLog.15: Fix old entry.

* etc/NEWS: Mention this.

Fixes: debbugs:9745
 2011-10-17 23:52:32 -07:00
Martin Rudalics
366ca7f3da In vc actions use quit-windows-on instead of delete-windows-on. 
* window.el (quit-windows-on): New function.
* vc/vc.el (vc-revert, vc-rollback):
* vc/vc-dispatcher.el (vc-finish-logentry): Call quit-windows-on
instead of deleting windows.  (Bug#4557) (Bug#5310) (Bug#5556)
(Bug#6183) (Bug#7074)((Bug#7447)
 2011-10-10 19:52:03 +02:00
Juri Linkov
7cc6e15441 Capitalize non-function content words in menu item strings. 
* lisp/buff-menu.el (Buffer-menu-mode-map):
* lisp/dired.el (dired-mode-map):
* lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-map)
(lisp-interaction-mode-map):
* lisp/emacs-lisp/package.el (package-menu-mode-map):
* lisp/epa.el (epa-key-list-mode-map):
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu)
(menu-bar-options-menu):
* lisp/outline.el (outline-mode-menu-bar-map):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map):
* lisp/vc/vc-dir.el (vc-dir-menu-map):
* lisp/vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map):
Capitalize non-function content words in menu item strings.

* lisp/dired.el (dired-mode-map): Add menu item for
`image-dired-dired-toggle-marked-thumbs'.
 2011-09-18 23:43:20 +03:00
Juri Linkov
91ab9c13bf * lisp/progmodes/compile.el (compilation-start): Let-bind `thisenv' to 
`compilation-environment'.  Set buffer-local
`compilation-environment' to `thisenv' later after (funcall mode).
(Bug#8340)

* lisp/vc/vc-git.el (vc-git-grep): Remove --no-color.  (Bug#9408)
(vc-git-grep): Prepend "PAGER=" to `compilation-environment'
instead of replacing its value.  (Bug#8340)
 2011-09-07 15:17:54 +03:00
Thierry Volpiatto
81ec0c88f2 Add missing piece of earlier commit. 
* lisp/vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories.

Fixes: debbugs:9391
 2011-09-02 00:54:34 -07:00
Wilfred Hughes
793d32bb23 * lisp/vc/vc-git.el (vc-git-grep): Use --no-color. (tiny change) 
Fixes: debbugs:9408
 2011-09-01 00:29:56 -07:00
Reuben Thomas
5664fa7b04 * lisp/vc/pcvs-defs.el (cvs-find-file-and-jump): Typo in docstring. 
Fixes: debbugs:9369
 2011-08-30 10:40:51 -04:00
Chong Yidong
37e11a6319 Lisp code shouldn't use set-time-zone-rule except through setenv. 
* time.el (display-time-world-list, display-time-world-display):
* time-stamp.el (time-stamp-string):
* vc/add-log.el (add-change-log-entry): Use setenv instead of
set-time-zone-rule.

* src/editfns.c (Fset_time_zone_rule): Document relationship with the
setenv function.

Fixes: debbugs:7337
 2011-08-08 11:53:35 -04:00
Lars Magne Ingebrigtsen
fc233c9d7e `diff' doc clarification 
* vc/diff.el (diff): Clarify the order the file names are read
(bug#7111).
 2011-07-14 16:15:06 +02:00
Sergei Organov
a1c9f41b78 * lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past. 
Fixes: debbugs:5181
 2011-07-13 00:58:34 -07:00
Lars Magne Ingebrigtsen
be958f1d65 (ediff-patch-file): Clarify doc string 
Fixes: debbugs:3138
 2011-07-11 17:03:24 +02:00
Bob Rogers
455e4fa13a * vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256). 2011-07-09 21:42:39 -04:00
Stefan Monnier
0757af948b * lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Remove svn, it's only 
provided by a particular plugin.
 2011-07-08 10:02:44 -04:00
Lars Magne Ingebrigtsen
ce1438d696 * vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log* 
for consistency with the other vc buffers (bug#6197).
(vc-checkin): Ditto.
 2011-07-03 03:15:38 +02:00
Stefan Monnier
eb604e34e5 * lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Update. 
(vc-bzr-revision-completion-table): Add support for annotate and date.
 2011-07-01 13:45:31 -04:00
Paul Eggert
0ef923dcc3 * vc/ediff-util.el (ediff-calc-command-time): Use time-since 
and float-time.  Say "NNN.NNN seconds" rather than "NNN seconds
+ NNN microseconds".
 2011-06-30 21:44:40 -07:00
Chong Yidong
16f07dd791 * lisp/vc/vc.el (vc-revert-show-diff): Default to t. 2011-06-26 15:34:17 -04:00
Chong Yidong
2afef60a03 New option for showing a diff in vc-revert (Bug#8927). 
* vc/vc.el (vc-revert-show-diff): New defcustom.
(vc-diff-internal): New arg specifying diff buffer.
(vc-revert): Obey vc-revert-show-diff.  If we show a diff, don't
reuse an existing *vc-diff* buffer.
 2011-06-26 00:05:39 -04:00
Juanma Barranquero
b3e945d3a4 Silence warning for unused `dotimes' counter variables. 
* mpc.el (mpc-select-extend, mpc-songpointer-context):
* vc/log-view.el (log-view-beginning-of-defun):
* vc/smerge-mode.el (smerge-apply-resolution-patch)
  (smerge-refine-forward, smerge-refine-chopup-region):
 2011-06-02 13:24:12 +02:00
Leo Liu
e1b90ef6ec Implement primitive `sha1' and remove sha1.el 2011-05-24 16:22:58 +08:00
Stefan Monnier
4f91a8160f Don't quote lambda expressions with `quote'. 2011-05-23 14:57:17 -03:00
Stefan Monnier
782fc81943 * lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark. 
Fixes: debbugs:8710
 2011-05-23 14:03:03 -03:00
Jari Aalto
f0fb805946 Maked "edited" tag stand out in vc-dir (Bug#8178). 
* vc/vc-dir.el (vc-default-dir-printer): Give edited tag a
different face.
 2011-05-22 15:36:07 -04:00
Chong Yidong
d5b44c937b Fix diff-changed face definition. 
* lisp/vc/diff-mode.el (diff-changed): Don't use terminal specs for
defface (Bug#8144).
 2011-05-22 15:22:37 -04:00
Glenn Morris
c71a0d48f3 Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com. 2011-05-16 19:26:56 -07:00
Glenn Morris
1aba75c248 * lisp/vc/diff-mode.el: Fix paren typo. 2011-05-15 11:51:21 -07:00
Chong Yidong
5e9e35cd1d Fix minor bug of diff-fixup-modifs on small diffs (Bug#8672). 
* vc/diff-mode.el (diff-fixup-modifs): Locate correct position for
hunk-end tags.
 2011-05-15 10:09:43 -04:00
Chong Yidong
c8e837514f Bind = to diff command in vc-annotate mode (Bug#8671) 
* lisp/vc/vc-annotate.el (vc-annotate-mode-map): Bind = to
vc-annotate-show-diff-revision-at-line.
 2011-05-15 09:47:56 -04:00
Glenn Morris
375cb676c1 add-log font-lock fix for mutilple authors (bug#8644) 
* lisp/vc/add-log.el (change-log-font-lock-keywords): Also handle multiple
author lines with leading tabs.
 2011-05-14 16:58:25 -07:00
Glenn Morris
7210a7391f add-log.el fix for multiple author entries (bug#8645) 
* lisp/vc/add-log.el (add-change-log-entry): Don't start adding a new entry
in the middle of an existing one with multiple authors.
 2011-05-14 16:27:09 -07:00
Glenn Morris
d2fc7e3d0f Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de. 2011-05-12 00:07:06 -07:00
Glenn Morris
60f884b214 Silence diff-mode.el compilation. 
* lisp/vc/diff-mode.el (smerge-refine-subst): Declare.
(diff-refine-hunk): Don't require smerge-mode when compiling.
 2011-05-05 21:07:47 -07:00
Leo Liu
3581347187 Fix description of diff.el 2011-05-02 20:22:38 +08:00
Chong Yidong
3ba7869ce8 Add vc-annotate-goto-line. 
* vc/vc-annotate.el (vc-annotate-goto-line): New command.  Based
on a previous implementation by Juanma Barranquero (Bug#8366).
(vc-annotate-mode-map): Bind it to RET.
 2011-04-24 15:37:47 -04:00
Juanma Barranquero
80f499c7c1 lisp/vc/vc.el (ediff-vc-internal): Declare function. 2011-04-21 01:34:00 +02:00
Stefan Monnier
024ff1707e * lisp/vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since 
we're in VC after all.
 2011-04-20 14:39:39 -03:00
Christoph Scholtes
1c6c854ec7 * lisp/vc/vc.el (vc-diff-build-argument-list-internal) 
(vc-version-ediff, vc-ediff): New functions.
(vc-version-diff): Use vc-diff-build-argument-list-internal.
* doc/emacs/maintaining.texi (Old Revisions): Add paragraph on new function
vc-ediff.
* etc/NEWS: Document new function `vc-ediff'.
 2011-04-20 14:33:09 -03:00
Sam Steingold
7eed1860d8 * lisp/vc/add-log.el (change-log-font-lock-keywords): Add "Thanks to" to acknowledgments. 2011-04-18 16:35:18 -04:00