procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>

Browse source 
* 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.
This commit is contained in:
Michael Kifer 2006-12-23 21:33:50 +00:00
parent 4c1f826966
commit c6a85d16a5
3 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/emulation/viper-cmd.el
View file

@ -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 ()