1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 11:50:51 -08:00
Commit graph

193 commits

Author SHA1 Message Date
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
Paul Eggert
91af3942e9 Spelling fixes. 2011-11-14 15:59:56 -08:00
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