Mercurial > emacs
changeset 85847:baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
top level, make it dependent on the emacs flavor.
* play/gamegrid.el (gamegrid-kill-timer, gamegrid-start-timer):
Test for XEmacs not for itimer.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 01 Nov 2007 03:18:42 +0000 |
| parents | 56cec281e296 |
| children | 2fa69d7fdc0c |
| files | lisp/ChangeLog lisp/ediff-util.el lisp/play/gamegrid.el |
| diffstat | 3 files changed, 36 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 01 03:06:23 2007 +0000 +++ b/lisp/ChangeLog Thu Nov 01 03:18:42 2007 +0000 @@ -1,3 +1,18 @@ +2007-11-01 Dan Nicolaescu <dann@ics.uci.edu> + + * ediff-util.el (ediff-nuke-selective-display): Move definition to + top level, make it dependent on the emacs flavor. + + * play/gamegrid.el (gamegrid-kill-timer, gamegrid-start-timer): + Test for XEmacs not for itimer. + + * term/sun-mouse.el: + * obsolete/sun-fns.el: + * obsolete/sun-curs.el: Remove files. + + * term/sun.el (select-previous-complex-command): Remove + obsolete code. + 2007-10-31 Tassilo Horn <tassilo@member.fsf.org> * doc-view.el (doc-view-cache-directory): Fix bug where an integer
--- a/lisp/ediff-util.el Thu Nov 01 03:06:23 2007 +0000 +++ b/lisp/ediff-util.el Thu Nov 01 03:18:42 2007 +0000 @@ -4071,28 +4071,25 @@ ) )) -(cond ((fboundp 'nuke-selective-display) - ;; XEmacs has nuke-selective-display - (defalias 'ediff-nuke-selective-display 'nuke-selective-display)) - (t - (defun ediff-nuke-selective-display () - (save-excursion - (save-restriction - (widen) - (goto-char (point-min)) - (let ((mod-p (buffer-modified-p)) - buffer-read-only end) - (and (eq t selective-display) - (while (search-forward "\^M" nil t) - (end-of-line) - (setq end (point)) - (beginning-of-line) - (while (search-forward "\^M" end t) - (delete-char -1) - (insert "\^J")))) - (set-buffer-modified-p mod-p) - (setq selective-display nil))))) - )) +(defun ediff-nuke-selective-display () + (if (featurep 'xemacs) + (nuke-selective-display) + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (let ((mod-p (buffer-modified-p)) + buffer-read-only end) + (and (eq t selective-display) + (while (search-forward "\^M" nil t) + (end-of-line) + (setq end (point)) + (beginning-of-line) + (while (search-forward "\^M" end t) + (delete-char -1) + (insert "\^J")))) + (set-buffer-modified-p mod-p) + (setq selective-display nil)))))) ;; The next two are modified versions from emerge.el.
--- a/lisp/play/gamegrid.el Thu Nov 01 03:06:23 2007 +0000 +++ b/lisp/play/gamegrid.el Thu Nov 01 03:18:42 2007 +0000 @@ -395,7 +395,7 @@ (defun gamegrid-start-timer (period func) (setq gamegrid-timer - (if (featurep 'itimer) + (if (featurep 'xemacs) (start-itimer "Gamegrid" func period @@ -420,7 +420,7 @@ (defun gamegrid-kill-timer () (if gamegrid-timer - (if (featurep 'itimer) + (if (featurep 'xemacs) (delete-itimer gamegrid-timer) (cancel-timer gamegrid-timer))) (setq gamegrid-timer nil))