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

133 commits

Author SHA1 Message Date
Stefan Monnier
4a47c27573 Merge from emacs-23 2010-11-17 22:54:14 -05:00
Stefan Monnier
ebff325e43 * lisp/vc/vc.el (vc-deduce-backend): Use default-directory in shell-mode 
and compilation-mode.

Fixes: debbugs:7350
 2010-11-12 08:44:46 -05:00
Stefan Monnier
4e9e1584fd * lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to 
highlight when one of them is empty.
 2010-11-12 08:35:36 -05:00
Stefan Monnier
d607b96bc2 Merge from emacs-23 2010-11-09 15:07:10 -05:00
Glenn Morris
9b026d9f13 Replace still more end-of-line etc with line-end-position, etc. 
* lisp/gnus/nnbabyl.el (nnbabyl-request-move-article, nnbabyl-delete-mail)
(nnbabyl-check-mbox): Use point-at-bol.

* lisp/cedet/semantic/lex.el (semantic-lex-ignore-comments, semantic-flex):
* lisp/cedet/semantic/grammar.el (semantic-grammar-epilogue):
* lisp/cedet/ede/speedbar.el (ede-find-nearest-file-line):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/ede/autoconf-edit.el (autoconf-delete-parameter):
Use point-at-bol and point-at-eol.

* lisp/vc/emerge.el (emerge-line-number-in-buf):
* lisp/textmodes/ispell.el (ispell-region):
* lisp/textmodes/fill.el (current-fill-column):
* lisp/progmodes/xscheme.el (xscheme-send-current-line):
* lisp/progmodes/vhdl-mode.el (vhdl-current-line, vhdl-line-copy):
* lisp/progmodes/tcl.el (tcl-hairy-scan-for-comment):
* lisp/progmodes/sh-script.el (sh-handle-prev-do):
* lisp/progmodes/meta-mode.el (meta-indent-line):
* lisp/progmodes/idlwave.el (idlwave-goto-comment, idlwave-fill-paragraph)
(idlwave-in-quote):
* lisp/progmodes/idlw-shell.el (idlwave-shell-current-frame)
(idlwave-shell-update-bp-overlays, idlwave-shell-sources-filter):
* lisp/progmodes/fortran.el (fortran-looking-at-if-then):
* lisp/progmodes/etags.el (find-tag-in-order, etags-snarf-tag):
* lisp/progmodes/cperl-mode.el (cperl-sniff-for-indent)
(cperl-find-pods-heres):
* lisp/progmodes/ada-mode.el (ada-get-current-indent, ada-narrow-to-defun):
* lisp/net/quickurl.el (quickurl-list-insert):
* lisp/net/ldap.el (ldap-search-internal):
* lisp/net/eudc.el (eudc-expand-inline):
* lisp/mail/sendmail.el (sendmail-send-it):
* lisp/mail/mspools.el (mspools-visit-spool, mspools-get-spool-name):
* lisp/emulation/viper-cmd.el (viper-paren-match, viper-backward-indent)
(viper-brac-function):
* lisp/calc/calc-yank.el (calc-do-grab-region):
* lisp/calc/calc-keypd.el (calc-keypad-press):
* lisp/term.el (term-move-columns, term-insert-spaces):
* lisp/speedbar.el (speedbar-highlight-one-tag-line):
* lisp/simple.el (current-word):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* lisp/info.el (Info-find-node-in-buffer-1, Info-follow-reference)
(Info-scroll-down):
* lisp/hippie-exp.el (he-line-beg):
* lisp/epa.el (epa--marked-keys):
* lisp/dired-aux.el (dired-kill-line, dired-do-kill-lines)
(dired-update-file-line, dired-add-entry, dired-remove-entry)
(dired-relist-entry):
* lisp/buff-menu.el (Buffer-menu-buffer):
* lisp/array.el (current-line):
* lisp/allout.el (allout-resolve-xref)
(allout-latex-verbatim-quote-curr-line):
Replace yet more uses of end-of-line etc with line-end-position.
 2010-11-08 21:33:07 -08:00
Glenn Morris
b05fde666f Minor emerge changes. 
* lisp/vc/emerge.el (emerge-eval-in-buffer): Remove, and replace all uses
with with-current-buffer.
(diff, template): Give dynamic local variables a prefix.
(emerge-line-numbers): Rename local `diff' to emerge-line-diff.
(emerge-line-number-in-buf): Update for above name change.
(emerge-combine-versions-internal): Rename local `template' to
emerge-combine-template.
(emerge-combine-versions-edit): Update for above name change.
 2010-11-06 11:51:11 -07:00
Glenn Morris
537b04b96a Don't be so lax with spelling. 
* lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix.

* doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix.
 2010-11-02 20:49:04 -07:00
Chong Yidong
4624de7837 Remove extra leftover args to vc-*-checkin. 
* vc/vc-arch.el (vc-arch-checkin):
* vc/vc-cvs.el (vc-cvs-checkin):
* vc/vc-mtn.el (vc-mtn-checkin):
* vc/vc-rcs.el (vc-rcs-checkin):
* vc/vc-sccs.el (vc-sccs-checkin):
* vc/vc-svn.el (vc-svn-checkin): Remove optional extra arg, unused
since 2010-04-21 commit by Stefan Monnier.
 2010-10-31 23:16:48 -04:00
Chong Yidong
2699a55464 Merge changes from emacs-23 branch 2010-10-31 10:40:01 -04:00
Stefan Monnier
a62b88d401 * lisp/vc/log-edit.el (log-edit-rewrite-fixes): State its safety pred. 2010-10-28 10:36:59 -04:00
Stefan Monnier
ce8794df2c * lisp/vc/log-edit.el (log-edit-rewrite-fixes): New var. 
(log-edit-author): New dynamic var.
(log-edit-changelog-ours-p, log-edit-insert-changelog-entries): Use it
to return the author if different from committer.
(log-edit-insert-changelog): Use them to add Author: and Fixes headers.
 2010-10-27 17:47:09 -04:00
Dan Nicolaescu
293e7c22cb * lisp/vc/log-view.el (log-view-mode-map): Bind revert-buffer. 2010-10-09 20:40:58 -07:00
Juanma Barranquero
4628bef1ee Merge changes from emacs-23 branch. 2010-10-08 12:14:47 +02:00
Glenn Morris
24ac444fbe Remove some tests for defunct system-types. 
* lisp/vc/ediff-wind.el (ediff-setup-control-frame):
* lisp/vc/ediff-ptch.el (ediff-default-backup-extension):
* lisp/vc/ediff-diff.el (ediff-shell, ediff-diff-options)
(ediff-exec-process): Remove system-types emx, windows-95.
 2010-10-08 00:51:19 -07:00
Dan Nicolaescu
82fb8701c2 Make 'g' (AKA revert-buffer) rerun the VC log, log-incoming and 
log-outgoing commands.
* lisp/vc/vc.el (vc-log-internal-common): Add a new argument and use it
to create a buffer local revert-buffer-function variable.
(vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a
revert-buffer-function lambda.
 2010-10-03 17:26:41 -07:00
Glenn Morris
67141a37c1 Remove vc-header-alist, obsolete since 21.1. 
* lisp/vc/vc-hooks.el (vc-header-alist): Remove obsolete variable.
* lisp/vc/vc.el (vc-static-header-alist): Doc fix.
* lisp/vc/vc-cvs.el (vc-cvs-header):
* lisp/vc/vc-rcs.el (vc-rcs-header):
* lisp/vc/vc-sccs.el (vc-sccs-header):
* lisp/vc/vc-svn.el (vc-svn-header): Do not consult vc-header-alist.
* lisp/obsolete/vc-mcvs.el (vc-mcvs-header):
* lisp/progmodes/cperl-mode.el (cperl-mode): Only set vc-header-alist
on XEmacs.

* etc/NEWS: Mention above change.
 2010-10-03 14:05:47 -07:00
Glenn Morris
3226d6cacf Remove some functions, variables and aliases obsolete since at least 21.1. 
* doc/misc/misc.texi (Shell Mode): Remove reference to old function name.

* src/character.c (Fchar_bytes): Remove obsolete function.
(syms_of_character): Remove Schar_bytes.
* lisp/subr.el (char-bytes): Remove obsolete function.

* lisp/emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias.

* lisp/isearch.el (isearch-return-char): Remove obsolete function.

* lisp/mouse.el: No longer provide mldrag.
(mldrag-drag-mode-line, mldrag-drag-vertical-line):
Remove obsolete aliases.

* lisp/comint.el (comint-kill-output): Remove obsolete alias.

* lisp/shell.el: Comment fix.

* lisp/composite.el (decompose-composite-char): Remove obsolete function.
* lisp/ps-def.el (decompose-composite-char): Remove unused function.

* lisp/iswitchb.el (iswitchb-default-keybindings): Remove obsolete function.

* lisp/outline.el (outline-visible): Remove obsolete function.

* lisp/term/pc-win.el (x-frob-font-slant, x-frob-font-weight):
* lisp/faces.el (internal-find-face, internal-get-face)
(frame-update-faces, frame-update-face-colors)
(x-frob-font-weight, x-frob-font-slant)
(internal-frob-font-weight, internal-frob-font-slant)
(x-make-font-bold, x-make-font-demibold, x-make-font-unbold)
(x-make-font-italic, x-make-font-oblique, x-make-font-unitalic)
(x-make-font-bold-italic): Remove functions and aliases, obsolete
since Emacs 21.1.
* lisp/emulation/viper-util.el (viper-get-face):
* lisp/obsolete/lucid.el (find-face, get-face): Use facep.
* lisp/vc/ediff-init.el (ediff-valid-color-p, ediff-get-face):
Remove unused functions.
* lisp/vc/ediff-util.el (ediff-submit-report): Doc fix.

* etc/NEWS: Mention above changes.
 2010-10-01 19:46:13 -07:00
Eli Zaretskii
cad90f3b7a Fix documentation of VC status indicator in mode line. 
lisp/vc/vc-hooks.el (vc-default-mode-line-string): Doc fix.
 doc/emacs/maintaining.texi (VC Mode Line): Mention all the possible VC
 status indicator characters.
 2010-09-30 14:44:25 +02:00
Glenn Morris
7b344dfef7 Cosmetic changes for add-log.el. 
* lisp/vc/add-log.el: Don't require timezone when compiling.
(timezone-make-date-sortable): Autoload it.
(change-log-sortable-date-at): Don't require timezone.
Use `ignore-errors'.
 2010-09-23 00:17:08 -07:00
Juanma Barranquero
6664fc59a8 Merge changes from emacs-23 branch. 2010-09-14 16:41:53 +02:00
Chong Yidong
aad4679e7d Add "Version:" and "Package:" Lisp file headers. 2010-08-29 16:10:43 -04:00
Chong Yidong
bd78fa1d54 Add "Package:" file headers to denote built-in packages. 2010-08-29 12:17:13 -04:00
Stefan Monnier
537ffaf3c9 * lisp/vc/add-log.el (add-log-file-name): Don't get confused by symlinks. 2010-08-21 16:09:46 +02:00
Dan Nicolaescu
b3d42406f8 * lisp/vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer. 2010-08-05 21:01:00 -07:00
Chong Yidong
fea9cabd27 Merge changes from emacs-23 branch. 2010-07-16 11:42:15 -04:00
Chong Yidong
2ec1b5ee34 Merge changes from emacs-23 branch. 2010-07-10 14:52:53 -04:00
Chong Yidong
a2f043d3d7 Allow global VC ops like `C-x v D' in Diff and Log-View buffers. 
* vc/diff-mode.el (diff-vc-backend): New var.

* vc/vc.el (vc-deduce-backend): New fun.  Handle diff buffers.
(vc-root-diff, vc-print-root-log, vc-log-incoming)
(vc-log-outgoing): Use it.
(vc-diff-internal): Set diff-vc-backend.
 2010-06-29 14:17:31 -04:00
Juri Linkov
5af72a47bb * lisp/vc/vc.el (vc-diff-internal): Set `revert-buffer-function' 
buffer-locally to lambda that re-runs the vc diff command.  (Bug#6447)
 2010-06-25 00:38:07 +03:00
Stefan Monnier
2a64315a11 Merge from emacs-23 2010-06-16 16:08:41 -04:00
Juri Linkov
c42fe9a55d * compare-w.el: Move to the "vc" subdirectory. 2010-06-14 18:48:52 +03:00
Chong Yidong
133a8d82ea Revert 2010-06-02 change to log-edit-font-lock-keywords (Bug#6343). 
* vc/log-edit.el (log-edit-font-lock-keywords): Revert 2010-06-02
change temporarily (Bug#6343).
 2010-06-12 13:14:43 -04:00
Juri Linkov
9766adfbca * lisp/finder.el (finder-known-keywords): Add keyword "vc" 
for version control.

* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
* emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
* vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
* vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
 2010-06-11 22:09:57 +03:00
Juri Linkov
56b2854f30 Move version control related files to the "vc" subdirectory. 
* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el,
* ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el,
* ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el,
* ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el,
* pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el,
* smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el,
* vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el,
* vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el:
Move files to the "vc" subdirectory.
 2010-06-11 21:51:00 +03:00