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

202 commits

Author SHA1 Message Date
Leo Liu
c101ef0a3c Backport: * Fix typo in diff-file-prev/next 2012-06-24 10:30:51 +08:00
Andreas Schwab
c4347ab9e5 Fixes: debbugs:11344 
* vc/vc-git.el (vc-git-state): Fix regexp matching diff output.
 2012-04-26 11:27:37 +02:00
Andreas Schwab
38de3354b7 Fixes: debbugs:11109 
* vc/vc-git.el (vc-git-state): Don't try to match all of the diff
contents.
 2012-03-28 12:12:02 +02:00
Ami Fischman
c0bf77531e * vc/vc-git.el (vc-git-state): Avoid unnecessarily locking. 2012-03-26 11:08:15 +08:00
Simon Leinen
6e7e90fa24 * vc/vc.el (vc-merge): Fix a prompt. 2012-03-24 21:23:23 +08:00
Glenn Morris
9e1a1109f7 Tweak previous vz-bzr change yet again 2012-03-22 15:57:43 -04:00
Glenn Morris
b4715d2a08 Tweak previous vc-bzr change 2012-03-22 15:17:43 -04:00
Glenn Morris
335aff3569 Use bzr status --no-classify when supported (bug#6724) 
* lisp/vc/vc-bzr.el (vc-bzr-status-switches): New option.
(vc-bzr-command): If running "status", pass vc-bzr-status-switches.
 2012-03-22 15:06:03 -04:00
Leo Liu
9e345a01ba * lisp/vc/vc-hg.el (vc-hg-working-revision): Rework to work with both 
directory and file as argument.

Fixes: debbugs:10822
 2012-03-13 18:40:29 +08:00
Michael Albinus
99a54f2128 * net/tramp-sh.el (tramp-remote-process-environment): Add "PAGER=\"\"". 
Reported by Robert Lupton the Good <rhl@astro.princeton.edu>.

* vc/vc-git.el (vc-git--call): Enable `inhibit-null-byte-detection'.
Add "PAGER=" to `process-environment'.
 2012-03-01 10:01:08 +01:00
Glenn Morris
44e97401cd Standardize possessive apostrophe usage in manuals, docs, and comments 
Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
 2012-02-28 00:17:21 -08:00
Chong Yidong
67b0de1147 Add custom groups for VC backends, for consistency with vc-bzr. 
Callers changed.

* vc/vc-arch.el (vc-arch):
* vc/vc-cvs.el (vc-cvs):
* vc/vc-git.el (vc-git):
* vc/vc-hg.el (vc-hg):
* vc/vc-mtn.el (vc-mtn):
* vc/vc-rcs.el (vc-rcs):
* vc/vc-sccs.el (vc-sccs):
* vc/vc-svn.el (vc-svn): New customization group.

Fixes: debbugs:10871
 2012-02-25 12:29:09 +08:00
Glenn Morris
6ff86ec481 Tiny emerge-defvar-local fix 
* lisp/vc/emerge.el (emerge-defvar-local):
Set `permanent-local' property rather than unused `preserved'.
 2012-02-21 17:23:51 -05:00
Chong Yidong
20af23949d Fix mode-line-format handling bug in Ediff. 
* lisp/vc/ediff-init.el (ediff-strip-mode-line-format): Handle non-list
mode-line formats.

Fixes: debbugs:10839
 2012-02-19 16:14:30 +08:00
Glenn Morris
5de0e3c3d0 Header fix 2012-02-11 17:49:51 -08:00
Glenn Morris
6d216d7f11 * log-view.el (vc-diff-internal): Remove unneeded (and incorrect) declaration. 2012-02-11 15:02:29 -08:00
Leo Liu
1be3ca5ad7 Rename condition-case-no-debug to condition-case-unless-debug 2012-02-10 23:59:29 +08:00
Glenn Morris
dab3703d9b Small VC doc fixes 
* lisp/vc/log-view.el (log-view-toggle-entry-display):
* lisp/vc/vc.el (vc-merge, vc-pull): Doc fixes.
* etc/NEWS: Condense a few VC entries.
 2012-02-08 22:25:18 -08:00
Glenn Morris
e1ac4066d1 Minor-mode doc fixes for ARG behavior 
* lisp/completion.el (dynamic-completion-mode):
* lisp/dirtrack.el (dirtrack-debug-mode):
* lisp/electric.el (electric-layout-mode):
* lisp/epa-mail.el (epa-mail-mode, epa-global-mail-mode):
* lisp/face-remap.el (text-scale-mode, buffer-face-mode):
* lisp/iimage.el (iimage-mode):
* lisp/image-mode.el (image-transform-mode):
* lisp/minibuffer.el (completion-in-region-mode):
* lisp/scroll-lock.el (scroll-lock-mode):
* lisp/simple.el (next-error-follow-minor-mode):
* lisp/tar-mode.el (tar-subfile-mode):
* lisp/tooltip.el (tooltip-mode):
* lisp/vcursor.el (vcursor-use-vcursor-map):
* lisp/wid-browse.el (widget-minor-mode):
* lisp/emulation/tpu-edt.el (tpu-edt-mode):
* lisp/emulation/tpu-extras.el (tpu-cursor-free-mode):
* lisp/international/iso-ascii.el (iso-ascii-mode):
* lisp/language/thai-util.el (thai-word-mode):
* lisp/mail/supercite.el (sc-minor-mode):
* lisp/net/goto-addr.el (goto-address-mode):
* lisp/net/rcirc.el (rcirc-multiline-minor-mode, rcirc-track-minor-mode):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/progmodes/flymake.el (flymake-mode):
* lisp/progmodes/glasses.el (glasses-mode):
* lisp/progmodes/hideshow.el (hs-minor-mode):
* lisp/progmodes/pascal.el (pascal-outline-mode):
* lisp/textmodes/enriched.el (enriched-mode):
* lisp/vc/smerge-mode.el (smerge-mode):
Doc fixes (minor mode argument).

* etc/NEWS: Related markup.
 2012-02-07 21:12:24 -05:00
Glenn Morris
e43273eff0 Use ctl-x-map in place of C-x (bug#10566) 
For an example of the problems NOT doing this might cause, see eg
http://lists.gnu.org/archive/html/bug-gnu-emacs/2006-07/msg00000.html
Eg after:
  (global-set-key (kbd "C-u") ctl-x-map)
  (global-set-key (kbd "C-x") 'universal-argument)
just loading dired-x.el or term.el would give an error.

* lisp/dired-x.el (dired-bind-jump): Use ctl-x-map and ctl-x-4-map.
* lisp/term.el (term-raw-escape-map): Use Control-X-prefix.
* lisp/vc/vc-hooks.el (vc-prefix-map): Use ctl-x-map.
 2012-01-25 21:32:56 -05:00
Glenn Morris
5ae1a6c8a2 * lisp/vc/vc.el (vc-modify-change-comment): Scoping fix. (Bug#10513) 2012-01-24 19:07:04 -05:00
Glenn Morris
70df4bbe29 Fix rcs and sccs create-tag commands. 
* lisp/vc/vc-rcs.el (vc-rcs-create-tag):
* lisp/vc/vc-sccs.el (vc-sccs-create-tag):
Fix argument spec to be what vc-create-tag expects.

Fixes: debbugs:10515
 2012-01-24 00:22:50 -08:00
Glenn Morris
cb5850f27c Replace vc-dired references in comments with vc-dir. 2012-01-23 00:45:59 -08:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Paul Eggert
22bcf20469 Spelling fixes. 2011-12-30 17:27:15 -08:00
Paul Eggert
9858f6c326 Spelling fixes. 2011-12-29 18:52:49 -08:00
Chong Yidong
d031f2c7b7 * vc/vc-hooks.el (vc-keep-workfiles): Doc fix. 2011-12-22 18:16:45 +08:00
Chong Yidong
bc86f573ee * vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in filename arg. 2011-12-21 15:46:49 +08:00
Chong Yidong
a6198c9097 Fix bugs in vc-dir-mark-unmark and vc-dir-mark-all-files. 
* lisp/vc/vc-dir.el (vc-dir-parent-marked-p, vc-dir-children-marked-p):
Don't signal an error in a predicate function; return non-nil.
(vc-dir-mark-file): Move the error here.
(vc-dir-mark-unmark): If acting on the region, keep going if one
of the entries cannot be marked/unmarked.
(vc-dir-mark-all-files): If current entry is a directory, mark
only child files, as documented.
 2011-12-19 15:00:16 +08:00
Paul Eggert
99d990817c Spelling fixes. 2011-12-18 22:21:24 -08:00
Chong Yidong
9cff91f800 More updates for VC documentation. 
* doc/emacs/maintaining.texi (VCS Concepts): Make "revision" terminology
less CVS-specific.
(VC With A Merging VCS, VC With A Locking VCS): Add xref to
Registering node.
(Secondary VC Commands): Deleted.  Promote subnodes.
(Log Buffer): Add command name for C-c C-c.  Fix the name of the
log buffer.  Add index entries.
(VCS Changesets, Types of Log File, VC With A Merging VCS): Use
"commit" terminology.
(Old Revisions): Move it to just before VC Change Log.  "Tag" here
doesn't refer to tags tables.  Note other possible forms of the
revision ID.  C-x v = does not save.
(Registering): Note similarity to C-x v v action.  Fix description
of how backends are chosen.  De-document vc-default-init-revision.
(VC Change Log): Document C-x v l in VC-Dir buffer.  Document RET
in root log buffers.

* lisp/vc/vc.el (vc-deduce-fileset): Minor doc fix.
 2011-12-17 15:50:08 +08:00
Paul Eggert
301b181a14 Spelling fixes. 2011-12-16 22:51:13 -08:00
Chong Yidong
99a289d98d * lisp/vc/vc.el (vc-next-action): Doc fix; remove CVS-isms. 2011-12-16 23:55:00 +08:00
Paul Eggert
fac916bfd7 Spelling fixes. 2011-12-14 13:05:20 -08:00
Paul Eggert
c80e3b4aed Spelling fixes. 2011-12-04 00:02:42 -08:00
Michael Albinus
f3af92b794 * vc/diff-mode.el (diff-find-file-name): Make `read-file-name' 
aware of remote file names.  (Bug#10124)
 2011-11-29 15:59:24 +01:00
Eli Zaretskii
c60c3703ac Prevent Diff Mode from stealing M-z binding. 
lisp/vc/diff-mode.el (diff-mode-map): Don't inherit 'z' => 'M-z' from
 special-mode-map.
 2011-11-28 20:03:11 +02:00
Paul Eggert
e47695319f Spelling fixes. 2011-11-26 20:43:11 -08:00
Paul Eggert
e4920bc99d Spelling fixes. 2011-11-24 23:14:48 -08:00
Glenn Morris
3adbe22462 Give some autoloaded things doc-strings. 
* lisp/lpr.el (lpr-windows-system, lpr-lp-system):
* lisp/mail/binhex.el (binhex-begin-line):
* lisp/progmodes/grep.el (grep-history, grep-find-history):
* lisp/textmodes/flyspell.el:
* lisp/vc/pcvs-defs.el (cvs-global-menu):
* lisp/vc/vc-bzr.el (vc-bzr-admin-checkout-format-file):
* lisp/vc/vc-mtn.el (vc-mtn-admin-dir, vc-mtn-admin-format):
* lisp/vc/vc-cvs.el (vc-cvs-registered): Give them basic doc-strings.
 2011-11-24 00:21:03 -08:00
Juanma Barranquero
20db1522fe Fix typos. 2011-11-24 02:58:14 +01:00
Paul Eggert
ee7683ebb7 Spelling fixes. 2011-11-22 23:03:56 -08:00
Stefan Monnier
7978747fec * lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window. 2011-11-20 15:17:46 -05:00
Juanma Barranquero
fe7a3057a3 Fix typos. 2011-11-20 20:35:27 +01:00
Paul Eggert
40ba43b4b7 Spelling fixes. 2011-11-19 23:30:16 -08:00
Juanma Barranquero
cd1181dbec Fix typos. 2011-11-20 04:48:53 +01:00
Paul Eggert
e1dbe924b5 Spelling fixes. 2011-11-19 18:29:42 -08:00
Paul Eggert
5396468298 Spelling fixes. 2011-11-19 01:18:31 -08:00
Paul Eggert
4c36be58ca Spelling fixes. 2011-11-17 01:09:20 -08:00
Paul Eggert
da6062e6ea Spelling fixes. 2011-11-14 23:55:13 -08:00