diff options
author | Michael Kifer <kifer@cs.stonybrook.edu> | 2006-12-23 21:33:50 +0000 |
---|---|---|
committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2006-12-23 21:33:50 +0000 |
commit | c6a85d16a518115ac85e04d5b606961d438ced75 (patch) | |
tree | 080c76b62122a5892ce1f2a93bec2fdcf7333ac2 /lisp | |
parent | 4c1f8269661a0de955c116d221857059cfa882ef (diff) | |
download | emacs-c6a85d16a518115ac85e04d5b606961d438ced75.tar.gz |
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.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ediff-diff.el | 16 | ||||
-rw-r--r-- | lisp/emulation/viper-cmd.el | 16 |
2 files changed, 22 insertions, 10 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 7786326bea9..34a1ceda254 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -133,9 +133,13 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP." (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 @@ one optional arguments, diff-number to refine.") ;; 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) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index ac3ef55d6e4..d3dae72d13e 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -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 @@ Vi's prefix argument will be used. Otherwise, the prefix argument passed to (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 @@ Undo previous insertion and inserts new." (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 () |