summaryrefslogtreecommitdiff
path: root/lisp/vc
Commit message (Collapse)AuthorAgeFilesLines
* * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.Glenn Morris2011-01-191-2/+3
|
* vc-svn fix for bug#7861.Glenn Morris2011-01-181-10/+17
| | | | | * lisp/vc/vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status): Also check the property status.
* Refill some copyright headers.Glenn Morris2011-01-153-6/+9
|
* Nuke arch-tags.Glenn Morris2011-01-1533-33/+0
|
* Merge from emacs-23 branch.Glenn Morris2011-01-151-1/+1
|
* * lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.Stefan Monnier2011-01-141-2/+71
| | | | | | | | (smerge-resolve--normalize-re): New var. (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. (smerge-resolve): Use them. * lisp/newcomment.el (comment-only-p): New function. (comment-or-uncomment-region): Use it.
* Merge from emacs-23Stefan Monnier2011-01-1436-42/+39
|
* Use run-mode-hooks for major mode hooks.Stefan Monnier2011-01-132-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/textmodes/reftex-toc.el (reftex-toc-mode-map): Rename from reftex-toc-map. (reftex-toc-mode): Use define-derived-mode. * lisp/textmodes/reftex-sel.el (reftex-select-shared-map): New map. (reftex-select-label-mode-map, reftex-select-bib-mode-map): Rename from reftex-select-(label|bib)-map. Move init into declaration. (reftex-select-label-mode, reftex-select-bib-mode): Use define-derived-mode. * lisp/textmodes/reftex-index.el (reftex-index-phrases-mode-map) (reftex-index-mode-map): Rename from reftex-index(-phrases)-map. Move init into delcaration. (reftex-index-mode, reftex-index-phrases-mode): Use define-derived-mode. * lisp/speedbar.el (speedbar-mode-syntax-table): Renaqme from speedbar-syntax-table. Move init into declaration. (speedbar-mode-map): Rename from speedbar-key-map. Move init into declaration. (speedbar-file-key-map): Move init into declaration. (speedbar-mode): Use define-derived-mode. * lisp/recentf.el (recentf-mode): Don't run hook (or message) redundantly. * lisp/net/rcirc.el (rcirc-mode): Use run-mode-hooks. * lisp/emacs-lisp/chart.el (chart-mode-map): Rename from chart-map. (chart-face-list): Move initialization into declaration. (chart-mode): Use define-derived-mode. * lisp/calculator.el (calculator-mode-map): Move init into declaration. (calculator-mode): Use define-derived-mode. * lisp/cedet/srecode/srt-mode.el (srecode-template-mode): Use define-derived-mode. * lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode): Use run-mode-hooks. * lisp/erc/erc.el (erc-mode): * lisp/erc/erc-dcc.el (erc-dcc-chat-mode): Use define-derived-mode. * lisp/org/org-remember.el (org-remember-mode): * lisp/org/org-capture.el (org-capture-mode): Don't run hook redundantly. Fixes: debbugs:513
* Tweaks to tool-bar for default, VC-dir, Compile, and Info.Chong Yidong2011-01-081-25/+28
| | | | | | | | | | | | | * tool-bar.el (tool-bar-setup): Remove Help button. Remove label from Search and add a label to Undo. * vc/vc-dir.el (vc-dir-tool-bar-map): Rearrange, removing inappropriate buttons and adding :vert-only tags. * progmodes/compile.el (compilation-mode-tool-bar-map): Adjust to removal of Help tool-bar button. Remove Undo button for space. * info.el (info-tool-bar-map): Add :vert-only tags.
* vc-bzr fix for bug #7792.Glenn Morris2011-01-051-5/+8
| | | | | | * lisp/vc/vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time) (vc-bzr-annotate-extract-revision-at-line): Handle authors with embedded spaces.
* Fix 2010-11-22 change to diff.el.Chong Yidong2010-12-201-10/+2
| | | | | | * vc/diff.el (diff-better-file-name): Function deleted. abbreviating file names causes problems with shell-quote-argument. (diff-no-select): Just use expand-file-name.
* Delete long unused functions and variables in rect.el.Chong Yidong2010-12-151-1/+0
| | | | | | lisp/rect.el (operate-on-rectangle-lines, string-rectangle-string): Delete unused variables. (move-to-column-force): Remove function obsolete since 21.2.
* Merge from emacs-23Stefan Monnier2010-12-132-3/+6
|
* Misc vc-bzr.el.Glenn Morris2010-12-101-23/+34
| | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable state of the file matches. (Bug#7544) (vc-bzr-register, vc-bzr-checkin) (vc-bzr-annotate-extract-revision-at-line): Doc fixes. (vc-directory-exclusion-list): Remove unnecessary eval-after-load. Comment changes: Remove outdated comments about defunct upstream. Set maintainer to FSF.
* * lisp/vc/vc-dir.el (vc-dir-query-replace-regexp): Doc fix (Bug#7501).Bob Rogers2010-12-041-2/+1
|
* diff-sentinel trivia.Glenn Morris2010-12-021-2/+1
| | | | | | | * lisp/ibuf-ext.el (diff-sentinel): Update declaration. * lisp/ibuffer.el: Regenerate autoloads. * lisp/vc/diff.el (diff-sentinel): Make new arguments optional, eg for the sake of ibuffer-diff-buffer-with-file-1.
* Merge changes from emacs-23 branchChong Yidong2010-11-271-4/+3
|
* * diff.el (diff): Fix it for good, hopefully, this time.Stefan Monnier2010-11-251-5/+4
|
* * lisp/vc/diff.el (diff): Fix last change.Stefan Monnier2010-11-241-2/+2
|
* Always issue a full prompt in vc-merge-branch operation.Chong Yidong2010-11-232-34/+40
| | | | | | | | | * vc/vc.el (vc-merge): Remove optional arg PROMPT. Always prompt for a merge location. * vc/vc-bzr.el (vc-bzr-pull): Remove unused var. (vc-bzr-merge-branch): Always prompt. (vc-bzr-async-command): Use the full branch filename.
* Initial support for unified DVCS pull and merge.Chong Yidong2010-11-222-80/+211
| | | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars. (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull) (vc-bzr-merge-branch): New functions, implementing merge-branch and pull operations. * lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available. Accept optional prefix arg meaning to prompt for a command. (vc-update): Use vc-BACKEND-pull if available. Accept optional prefix arg meaning to prompt for a command. (vc-pull): Alias for vc-update.
* Cleanup diff-buffer-with-file.Stefan Monnier2010-11-221-52/+71
| | | | | | | | | | | | | | | | | * lisp/vc/diff.el (diff-old-temp-file, diff-new-temp-file): Remove. (diff-sentinel): Get them as arguments instead. (diff-old-file, diff-new-file, diff-extra-args): Remove. (diff-file-local-copy, diff-better-file-name): New funs. (diff-no-select): Rename from diff-into-buffer. Support buffers additionally to files. Move `buf' arg. Don't display buf. Prefer closures to buffer-local variables. (diff): Adjust accordingly. (diff-buffer-with-file): Move from files.el. * lisp/files.el (diff-buffer-with-file): Move to vc/diff.el. (diff-buffer-internal): Remove. (diff-buffer-buffer): Remove. (save-some-buffers-action-alist): Use diff-no-select so as not to guess the buffer name used, and so as not to mess up windows and frames.
* * lisp/files.el: Make revert work with diff-buffer-with-file.Bob Rogers2010-11-221-2/+6
| | | | | | | | | (diff-buffer-internal): New function extracted from diff-buffer-with-file (diff-buffer-with-file): Use it. * lisp/vc/diff.el (diff-into-buffer): New fun, extracted from diff. (diff): Use it. Fixes: debbugs:7277
* Merge from emacs-23Stefan Monnier2010-11-171-4/+8
|
* * lisp/vc/vc.el (vc-deduce-backend): Use default-directory in shell-modeStefan Monnier2010-11-121-2/+3
| | | | | | and compilation-mode. Fixes: debbugs:7350
* * lisp/vc/smerge-mode.el (smerge-refine): Choose better default part toStefan Monnier2010-11-121-0/+4
| | | | highlight when one of them is empty.
* Merge from emacs-23Stefan Monnier2010-11-091-3/+3
|
* Replace still more end-of-line etc with line-end-position, etc.Glenn Morris2010-11-081-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* Minor emerge changes.Glenn Morris2010-11-061-123/+113
| | | | | | | | | | | * 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.
* Don't be so lax with spelling.Glenn Morris2010-11-021-2/+1
| | | | | | * lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix. * doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix.
* Remove extra leftover args to vc-*-checkin.Chong Yidong2010-10-315-5/+5
| | | | | | | | | | * 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.
* Merge changes from emacs-23 branchChong Yidong2010-10-311-2/+2
|
* * lisp/vc/log-edit.el (log-edit-rewrite-fixes): State its safety pred.Stefan Monnier2010-10-281-0/+2
|
* * lisp/vc/log-edit.el (log-edit-rewrite-fixes): New var.Stefan Monnier2010-10-271-17/+60
| | | | | | | (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.
* * lisp/vc/log-view.el (log-view-mode-map): Bind revert-buffer.Dan Nicolaescu2010-10-091-0/+1
|
* Merge changes from emacs-23 branch.Juanma Barranquero2010-10-081-1/+1
|
* Remove some tests for defunct system-types.Glenn Morris2010-10-083-22/+19
| | | | | | | * 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.
* Make 'g' (AKA revert-buffer) rerun the VC log, log-incoming andDan Nicolaescu2010-10-031-8/+28
| | | | | | | | 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.
* Remove vc-header-alist, obsolete since 21.1.Glenn Morris2010-10-036-11/+9
| | | | | | | | | | | | | | * 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.
* Remove some functions, variables and aliases obsolete since at least 21.1.Glenn Morris2010-10-012-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* Fix documentation of VC status indicator in mode line.Eli Zaretskii2010-09-301-0/+3
| | | | | | 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.
* Cosmetic changes for add-log.el.Glenn Morris2010-09-231-7/+3
| | | | | | | * 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'.
* Merge changes from emacs-23 branch.Juanma Barranquero2010-09-141-2/+6
|
* Add "Version:" and "Package:" Lisp file headers.Chong Yidong2010-08-291-0/+1
|
* Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-2928-1/+29
|
* * lisp/vc/add-log.el (add-log-file-name): Don't get confused by symlinks.Stefan Monnier2010-08-211-1/+11
|
* * lisp/vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer.Dan Nicolaescu2010-08-051-0/+1
|
* Merge changes from emacs-23 branch.Chong Yidong2010-07-161-1/+16
|
* Merge changes from emacs-23 branch.Chong Yidong2010-07-104-35/+53
|
* Allow global VC ops like `C-x v D' in Diff and Log-View buffers.Chong Yidong2010-06-292-17/+18
| | | | | | | | | * 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.
View Lorry Controller Status