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

* ediff-util.el (ediff-nuke-selective-display): Move definition to

Browse source 
top level, make it dependent on the emacs flavor.

* play/gamegrid.el (gamegrid-kill-timer, gamegrid-start-timer):
Test for XEmacs not for itimer.
This commit is contained in:
Dan Nicolaescu 2007-11-01 03:18:42 +00:00
parent 07e5c0b0b7
commit 399f21c188
3 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/ChangeLog
View file

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

41
lisp/ediff-util.el
View file

@ -4071,28 +4071,25 @@ Mail anyway? (y or n) ")
)
))
(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.

4
lisp/play/gamegrid.el
View file

@ -395,7 +395,7 @@ static unsigned char gamegrid_bits[] = {
(defun gamegrid-start-timer (period func)
(setq gamegrid-timer
(if (featurep 'itimer)
(if (featurep 'xemacs)
(start-itimer "Gamegrid"
func
period
@ -420,7 +420,7 @@ static unsigned char gamegrid_bits[] = {
(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))