Mercurial > emacs
changeset 74857:2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-diff-options): clarify docstring.
(ediff-setup-diff-regions): disallow -u in ediff-diff-options.
* viper-cmd.el (viper-post-command-sentinel): protect against errors in
hooks.
(viper-add-newline-at-eob-if-necessary): add newline only if we
actually modify buffer; ignore errors if occur.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sat, 23 Dec 2006 21:33:50 +0000 |
| parents | 333882884f8a |
| children | 7b8a9230e332 |
| files | ChangeLog lisp/ediff-diff.el lisp/emulation/viper-cmd.el |
| diffstat | 3 files changed, 32 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Dec 23 20:11:10 2006 +0000 +++ b/ChangeLog Sat Dec 23 21:33:50 2006 +0000 @@ -1,3 +1,13 @@ +2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu> + + * ediff-diff.el (ediff-diff-options): clarify docstring. + (ediff-setup-diff-regions): disallow -u in ediff-diff-options. + + * viper-cmd.el (viper-post-command-sentinel): protect against errors in + hooks. + (viper-add-newline-at-eob-if-necessary): add newline only if we + actually modify buffer; ignore errors if occur. + 2006-12-22 Mark Davies <mark@mcs.vuw.ac.nz> * configure.in: Add support for NetBSD on x86-64, hp800 and sh3el.
--- a/lisp/ediff-diff.el Sat Dec 23 20:11:10 2006 +0000 +++ b/lisp/ediff-diff.el Sat Dec 23 21:33:50 2006 +0000 @@ -133,9 +133,13 @@ (defcustom ediff-diff-options "" "*Options to pass to `ediff-diff-program'. If Unix diff is used as `ediff-diff-program', - then a useful option is `-w', to ignore space. -Options `-c' and `-i' are not allowed. Case sensitivity can be - toggled interactively using \\[ediff-toggle-ignore-case]." +then a useful option is `-w', to ignore space. +Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be +toggled interactively using \\[ediff-toggle-ignore-case]. + +This variable is not for customizing the look of the differences produced by +the command \\[ediff-show-diff-output]. Use the variable +`ediff-custom-diff-options' for that." :set 'ediff-reset-diff-options :type 'string :group 'ediff-diff) @@ -254,10 +258,10 @@ ;; ediff-setup-diff-regions-function, which can also have the value ;; ediff-setup-diff-regions3, which takes 4 arguments. (defun ediff-setup-diff-regions (file-A file-B file-C) - ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options - (if (string-match "^-[ci]\\| -[ci]\\|\\(^\\| \\)-[^- ]+[ci]" + ;; looking for '-c', '-i', '-u', or 'c', 'i', 'u' among clustered non-long options + (if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]" ediff-diff-options) - (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'")) + (error "Options `-c', `-u', and `-i' are not allowed in `ediff-diff-options'")) ;; create, if it doesn't exist (or (ediff-buffer-live-p ediff-diff-buffer)
--- a/lisp/emulation/viper-cmd.el Sat Dec 23 20:11:10 2006 +0000 +++ b/lisp/emulation/viper-cmd.el Sat Dec 23 21:33:50 2006 +0000 @@ -171,7 +171,9 @@ (run-hook-with-args 'viper-before-change-functions beg end)) (defsubst viper-post-command-sentinel () - (run-hooks 'viper-post-command-hooks) + (condition-case conds + (run-hooks 'viper-post-command-hooks) + (error (viper-message-conditions conds))) (if (eq viper-current-state 'vi-state) (viper-restore-cursor-color 'after-insert-mode))) @@ -926,8 +928,7 @@ (condition-case nil (let (viper-vi-kbd-minor-mode) ; execute without kbd macros - (setq result (eval form)) - ) + (setq result (eval form))) (error (signal 'quit nil))) @@ -1971,9 +1972,16 @@ (if (and (eobp) (not (bolp)) require-final-newline + ;; add newline only if we actually edited buffer. otherwise it + ;; might unintentionally modify binary buffers + (buffer-modified-p) (not (viper-is-in-minibuffer)) (not buffer-read-only)) - (insert "\n"))) + ;; text property may be read-only + (condition-case nil + (insert "\n") + (error nil)) + )) )) (defun viper-yank-defun ()