1. 04 Mar, 2011 1 commit
  2. 03 Mar, 2011 5 commits
  3. 19 Feb, 2011 1 commit
    • Chong Yidong's avatar
      Improvements to vc-bzr conffile handling and pull/merge support. · 3ab713fd
      Chong Yidong authored
      * vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted.
      (vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf
      but returning an alist.  Ignore comments in bzr conffile.
      (vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf.
      (vc-bzr-error-regex-alist): New var.
      (vc-bzr-merge-branch): Use it to highlight the pull/merge buffer.
      
      * progmodes/compile.el (compilation--flush-directory-cache):
      Handle the case where cdr of compilation--flush-directory-cache
      points to no buffer, which can occur if we previously switched to
      compilation-mode in a pregenerated buffer.
      
      * vc/vc-dispatcher.el (vc-do-async-command): Bind
      inhibit-read-only to t.
      3ab713fd
  4. 17 Feb, 2011 1 commit
  5. 14 Feb, 2011 1 commit
    • Chong Yidong's avatar
      Add Log View toggle and log format customization for Git and Hg. · 33f6cf7b
      Chong Yidong authored
      * lisp/vc/vc-git.el (vc-git-root-log-format): New option for
      customizing log format.
      (vc-git-print-log, vc-git-log-outgoing, vc-git-log-incoming)
      (vc-git-log-view-mode): Use it.
      (vc-git-expanded-log-entry): New function.
      (vc-git-log-view-mode): Use it.  Truncate lines in root log.
      
      * lisp/vc/vc-hg.el (vc-hg-root-log-template): New option for
      customizing log format.
      (vc-hg-print-log): Use it.
      (vc-hg-expanded-log-entry): New function.
      (vc-hg-log-view-mode): Use vc-hg-root-log-template and
      vc-hg-expanded-log-entry.  Truncate lines in root log.
      
      * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Truncate lines in root log.
      
      * lisp/vc/log-view.el (log-view-mode-menu): Add
      log-view-toggle-entry-display.
      33f6cf7b
  6. 13 Feb, 2011 2 commits
    • Chong Yidong's avatar
      Bind RET in Log View mode to a command that toggles a more detailed display. · d4eb88c7
      Chong Yidong authored
      * lisp/vc/log-view.el: New command log-view-toggle-entry-display for
      toggling log entries between concise and detailed forms.
      (log-view-toggle-entry-display): New command.
      (log-view-mode-map): Bind RET to it.
      (log-view-expanded-log-entry-function): New variable.
      (log-view-current-entry, log-view-inside-comment-p)
      (log-view-current-tag): New functions.
      (log-view-toggle-mark-entry): Use log-view-current-entry and
      log-view-end-of-defun instead of searching directly with
      log-view-message-re.
      (log-view-end-of-defun): Likewise.  Add optional ARG for
      compatibility with end-of-defun.
      (log-view-end-of-defun): Ignore comments and VC buttons.
      
      * lisp/vc/vc-bzr.el (vc-bzr-expanded-log-entry): New function.
      (vc-bzr-log-view-mode): Use log-view-expanded-log-entry-function.
      d4eb88c7
    • Chong Yidong's avatar
      Use simple buttons, instead of widget buttons, in vc-log. · 75d4dcc9
      Chong Yidong authored
      * lisp/vc/vc.el (vc-print-log-setup-buttons): Instead of using the
      widget library for buttons, just use button.el.
      
      * lisp/vc/log-view.el (log-view-mode-map): Don't inherit from
      widget-keymap.
      75d4dcc9
  7. 12 Feb, 2011 1 commit
  8. 10 Feb, 2011 1 commit
  9. 03 Feb, 2011 1 commit
  10. 01 Feb, 2011 1 commit
    • Sam Steingold's avatar
      * lisp/simple.el (special-mode-map): Bind "h" to `describe-mode'; · abef340a
      Sam Steingold authored
      bind "z" to `kill-this-buffer'.
      (completion-list-mode-map): Bind "z" to `kill-this-buffer'.
      * lisp/apropos.el (apropos-mode-map): Inherit from `special-mode-map'.
      (apropos-mode): Inherit from `special-mode'.
      * lisp/arc-mode.el (archive-mode-map): Inherit from `special-mode-map'.
      * lisp/bookmark.el (bookmark-bmenu-mode): Define using
      `define-derived-mode' inheriting from `special-mode'.
      * lisp/dired.el (dired-mode-map): Inherit from `special-mode-map'.
      * lisp/image-mode.el (image-mode-map): Ditto.
      * lisp/replace.el (occur-mode): Define using
      `define-derived-mode' inheriting from `special-mode'.
      * lisp/tar-mode.el (tar-mode): Inherit from `special-mode'.
      * lisp/calendar/diary-lib.el (diary-fancy-display-mode):
      Inherit from `special-mode-map'.
      * lisp/emacs-lisp/ert.el (ert-simple-view-mode, ert-results-mode):
      Inherit from `special-mode'.
      * lisp/emacs-lisp/package.el (package-menu-mode-map): Copy from
      `special-mode-map'.
      (package-menu-mode): Define using `define-derived-mode'
      inheriting from `special-mode'.
      * erc/erc-list.el (erc-list-menu-mode): Inherit from `special-mode'.
      * lisp/net/xesam.el (xesam-mode): Inherit from `special-mode'.
      (xesam-mode-map): Define separately.
      * lisp/play/solitaire.el (solitaire-mode): Inherit from `special-mode'.
      * lisp/progmodes/compile.el (compilation-minor-mode-map)
      (compilation-mode-map): Inherit from `special-mode-map'.
      * lisp/vc/diff-mode.el (diff-mode-shared-map):
      Inherit from `special-mode-map'.
      * lisp/vc/log-view.el (log-view-mode-map): Add a comment.
      abef340a
  11. 29 Jan, 2011 2 commits
    • Chong Yidong's avatar
      Refresh Dired and VC-dir buffers after vc-pull and vc-merge. · a2b6e5d6
      Chong Yidong authored
      * vc/vc-dispatcher.el (vc-set-async-update): New function for
      updating Dired or VC-dir buffers after async command completes.
      
      * vc/vc-bzr.el (vc-bzr-async-command): Return the process buffer.
      (vc-bzr-pull, vc-bzr-merge-branch): Use vc-set-async-update.
      
      * vc/vc-git.el (vc-git-merge-branch): Add FETCH_HEAD to branch
      completions if it exists.  Use vc-set-async-update.
      (vc-git-pull): Use vc-set-async-update.
      
      * vc/vc-hg.el (vc-hg-pull): Fix default-contents arg to
      read-shell-command.  Use vc-set-async-update.
      (vc-hg-merge-branch): Use vc-set-async-update.
      a2b6e5d6
    • Chong Yidong's avatar
      Rudimentary support for vc-pull and vc-merge in Git and Mercurial. · 659114fd
      Chong Yidong authored
      * lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of
      the other way around.
      
      * lisp/vc/vc-git.el (vc-git-branches, vc-git-pull)
      (vc-git-merge-branch): New functions.
      (vc-git-history): New var.
      
      * lisp/vc/vc-hg.el (vc-hg-history): New var.
      (vc-hg-pull): Perform default pull if called via Lisp by vc-pull.
      (vc-hg-merge-branch): New function.
      659114fd
  12. 28 Jan, 2011 1 commit
  13. 27 Jan, 2011 1 commit
  14. 26 Jan, 2011 1 commit
  15. 25 Jan, 2011 2 commits
  16. 22 Jan, 2011 1 commit
  17. 20 Jan, 2011 1 commit
  18. 19 Jan, 2011 1 commit
    • Glenn Morris's avatar
      vc-svn fix for bug#7861. · 5dd4f3f7
      Glenn Morris authored
      * lisp/vc/vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
      Also check the property status.
      5dd4f3f7
  19. 16 Jan, 2011 1 commit
  20. 15 Jan, 2011 1 commit
  21. 14 Jan, 2011 1 commit
  22. 13 Jan, 2011 1 commit
    • Stefan Monnier's avatar
      Use run-mode-hooks for major mode hooks. · 4d789d84
      Stefan Monnier authored
      * 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
      4d789d84
  23. 09 Jan, 2011 1 commit
    • Chong Yidong's avatar
      Tweaks to tool-bar for default, VC-dir, Compile, and Info. · 900503ae
      Chong Yidong authored
      * 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.
      900503ae
  24. 06 Jan, 2011 1 commit
    • Glenn Morris's avatar
      vc-bzr fix for bug #7792. · b0a8e46b
      Glenn Morris authored
      * 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.
      b0a8e46b
  25. 20 Dec, 2010 1 commit
    • Chong Yidong's avatar
      Fix 2010-11-22 change to diff.el. · f48fdaad
      Chong Yidong authored
      * 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.
      f48fdaad
  26. 15 Dec, 2010 1 commit
  27. 11 Dec, 2010 1 commit
    • Glenn Morris's avatar
      Misc vc-bzr.el. · 2b404597
      Glenn Morris authored
      * 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.
      2b404597
  28. 05 Dec, 2010 1 commit
  29. 03 Dec, 2010 1 commit
    • Glenn Morris's avatar
      diff-sentinel trivia. · c879436a
      Glenn Morris authored
      * 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.
      c879436a
  30. 25 Nov, 2010 2 commits
  31. 23 Nov, 2010 2 commits
    • Chong Yidong's avatar
      Always issue a full prompt in vc-merge-branch operation. · 3d92f44e
      Chong Yidong authored
      * 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.
      3d92f44e
    • Chong Yidong's avatar
      Initial support for unified DVCS pull and merge. · 2c3160c5
      Chong Yidong authored
      * 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.
      2c3160c5