Stefan Monnier [Tue, 23 Mar 2004 21:34:06 +0000 (21:34 +0000)]
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
(vc-arch-diff3-rej-p): Be a bit more flexible in what we accept.
(vc-arch-mode-line-string): Accept `added' state.
(vc-arch-state): Use inode-sigs if available.
(vc-arch-add-tagline): Rename from vc-arch-add-tag.
Copy&delete existing id file if any. Fallback if uuidgen is absent.
(vc-arch-tagline-re): New var.
(vc-arch-file-source-p, vc-arch-file-id, vc-arch-tagging-method): New funs.
(vc-arch-find-file-not-found-hook, vc-arch-register): New backend ops.
(vc-arch-registered): Try our best guess using vc-arch-file-source-p.
Stefan Monnier [Tue, 23 Mar 2004 20:50:36 +0000 (20:50 +0000)]
(diff-default-read-only): Change default.
(diff-mode-hook): Make it a defcustom. Add some options.
(diff-mode-map): Bind diff-refine-hook.
(diff-yank-handler): New var.
(diff-yank-function): New fun.
(diff-font-lock-keywords): Use them.
(diff-end-of-file): Handle case where file-header looks like diff text.
(diff-hunk-kill): Adjust to "new" hunk-next behavior.
(diff-file-kill): Delete a subsequent empty line, if applicable.
(diff-hunk-file-names): New fun, extracted from diff-tell-file-name.
(diff-find-file-name): Use it.
(diff-tell-file-name): New command.
(diff-mode): Be careful with view-mode.
(diff-delete-if-empty, diff-delete-empty-files, diff-make-unified):
New functions, for use in diff-mode-hook.
(diff-find-source-location): Catch "regex too large" errors.
(diff-apply-hunk, diff-test-hunk): Go to old or new file.
(diff-refine-hunk): New command.
Stefan Monnier [Tue, 23 Mar 2004 19:56:42 +0000 (19:56 +0000)]
(smerge-mode-menu): Fix activate pred for resolve.
(smerge-context-menu-map): Remove unused var.
(smerge-keep-all): Preserve markers.
(smerge-keep-n): New fun.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-ediff): Use it.
(smerge-kill-current): Use it. Make it work on some 3-part conflicts.
(smerge-popup-context-menu): Also use context-menu on 3-part conflicts.
(smerge-resolve): Resolve trivial 3-part conflicts.
Juri Linkov [Tue, 23 Mar 2004 07:38:57 +0000 (07:38 +0000)]
(dired-guess-shell-alist-default): Add choices for
extracting files into subdirectory. Add tbz and dz. Fix regexps.
Add extensions .[0-9] for man and nroff, and .pod for perldoc.
(dired-man): Use dired-guess-shell-command.
(dired-guess-shell-case-fold-search): Change defvar to defcustom.
Change default nil to t.
Juri Linkov [Tue, 23 Mar 2004 07:33:39 +0000 (07:33 +0000)]
(Man-width): New var.
(Man-getpage-in-background): Use it.
(Man-support-local-filenames): New var and fun.
(Man-build-man-command): Don't add a second %s.
(Man-fontify-manpage): Clean up message.
(Man-mode): Set outline-regexp, outline-level, imenu-generic-expression.
Luc Teirlinck [Tue, 23 Mar 2004 05:24:55 +0000 (05:24 +0000)]
(global-auto-revert-non-file-buffers): Expand doc string.
(buffer-stale-function): New variable.
(auto-revert-list-diff, auto-revert-dired-file-list)
(auto-revert-dired-changed-p, auto-revert-buffer-p): Delete.
(auto-revert-handler): Take over some functionality of deleted functions.
(auto-revert-buffers): Delete call to auto-revert-buffer-p.
Luc Teirlinck [Tue, 23 Mar 2004 05:20:11 +0000 (05:20 +0000)]
(dired-directory-changed-p, dired-buffer-stale-p): New functions.
(dired-internal-noselect): Use dired-directory-changed-p.
Eliminate revert messages.
(dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
Stefan Monnier [Mon, 22 Mar 2004 15:31:46 +0000 (15:31 +0000)]
(lisp-mode-variables): Don't set
normal-auto-fill-function and comment-indent-function.
The default values now work just as well.
Don't set font-lock-beginning-of-syntax-function since we already set
syntax-begin-function.
(lisp-outline-level): Put ;;;###autoload at same level as (.
(prin1-char): Quote special chars.
Stefan Monnier [Mon, 22 Mar 2004 15:21:08 +0000 (15:21 +0000)]
(byte-compile-log-lap, byte-compile-inline-expand): Use backquote.
(byte-optimize-pure-func): Rename from byte-optimize-concat.
(symbol-name, regexp-opt, regexp-quote): Mark as pure.
André Spiegel [Sun, 21 Mar 2004 15:42:14 +0000 (15:42 +0000)]
Add new optional BUFFER argument to vc-BACKEND-print-log and
vc-BACKEND-diff.
(vc-print-log): If the print-log implementation supports it, use the
new BUFFER argument to direct output to *vc-change-log*, not *vc*.
(vc-version-diff, vc-diff-internal): Doc fixes.
Kim F. Storm [Fri, 19 Mar 2004 13:17:16 +0000 (13:17 +0000)]
From David Ponce <david@dponce.com>
(ruler-mode-header-line-format-old): Don't `make-variable-buffer-local'.
(ruler-mode-ruler-function): Default to `ruler-mode-ruler'.
(ruler-mode-header-line-format): Simply funcall the above.
(ruler-mode): Use `make-local-variable' and `kill-local-variable'
to save/restore a previous header line format.
(ruler-mode-space): Don't depend on a numeric WIDTH value.
(ruler-mode-ruler): Use symbolic display elements for scrollbar,
fringes and margins width.
(ruler-mode-ruler-function): Default to ruler-mode-ruler
Kim F. Storm [Fri, 19 Mar 2004 00:43:16 +0000 (00:43 +0000)]
(Qcenter): Declare here.
(syms_of_xdisp): intern and staticpro it.
(handle_single_display_prop): Allow space display property on all
platforms.
(display_mode_line): Set mode_line_p before displaying line.
(calc_pixel_width_or_height): Declare extern. Add separate :align-to
handling. Remove complex cases for fringes and scroll-bars.
Add left, right, and center alignment positions. Add text (area)
width/height. Return width or height for image specs.
(produce_stretch_glyph): Improve handling of :align-to. Is now
relative to left of text area by default, but other base offsets
can be specified -- also for text lines.
Kim F. Storm [Fri, 19 Mar 2004 00:42:48 +0000 (00:42 +0000)]
(produce_glyphs): Handle IT_STRETCH.
(produce_stretch_glyph): New function to handle space width and
align-to display properties on non-window systems.