branch: scratch/hyperbole-lexbind commit 60d51ad2e4ce81da7d1e727db7784451650ff6fb Author: Bob Weiner <r...@gnu.org> Commit: Bob Weiner <r...@gnu.org>
Remove last references to XEmscs and xterm used under Emacs 18 --- hmouse-sh.el | 6 ------ hpath.el | 2 -- hui-window.el | 8 -------- hypb.el | 31 ------------------------------- 4 files changed, 47 deletions(-) diff --git a/hmouse-sh.el b/hmouse-sh.el index dc91c16..b84d770 100644 --- a/hmouse-sh.el +++ b/hmouse-sh.el @@ -427,12 +427,6 @@ point determined by `mouse-select-region-move-to-beginning'." (defun hmouse-move-point-eterm (arg-list) (apply 'mouse-move-point arg-list)) -(defun hmouse-move-point-xemacs () - (condition-case () - (mouse-set-point current-mouse-event) - ;; Catch "not in a window" errors, e.g. on modeline - (error nil))) - (defun hmouse-set-key-list (binding key-list) (mapc (lambda (key) (hkey-global-set-key key binding)) key-list) nil) diff --git a/hpath.el b/hpath.el index 00bd297..ce87773 100644 --- a/hpath.el +++ b/hpath.el @@ -988,8 +988,6 @@ See also `hpath:internal-display-alist' for internal, window-system independent hpath:external-display-alist-mswindows) (t (cdr (assoc (hyperb:window-system) (list (cons "emacs" hpath:external-display-alist-x) ; GNU Emacs under X - (cons "xemacs" hpath:external-display-alist-x) ; XEmacs under X - (cons "xterm" hpath:external-display-alist-x) ; GNU Emacs V18 under X (cons "next" hpath:external-display-alist-macos))))))) (defun hpath:is-p (path &optional type non-exist) diff --git a/hui-window.el b/hui-window.el index d4386a5..8b5536f 100644 --- a/hui-window.el +++ b/hui-window.el @@ -1225,10 +1225,6 @@ of the Smart Key." (+ (car (posn-col-row args)) (nth 0 (window-edges w-or-f))))) (t (car args))))) - ("xemacs" . (if (eventp args) - (event-x args) - (car args))) - ("xterm" . (car args)) ("next" . (nth 1 args)) ))))))) (if (integerp x) x))) @@ -1244,10 +1240,6 @@ of the Smart Key." (+ (cdr (posn-col-row args)) (nth 1 (window-edges w-or-f))))) (t (cdr args))))) - ("xemacs" . (if (eventp args) - (event-y args) - (cdr args))) - ("xterm" . (nth 1 args)) ("next" . (nth 2 args)) )))))) (if (integerp y) y))) diff --git a/hypb.el b/hypb.el index f896305..fadbdd4 100644 --- a/hypb.el +++ b/hypb.el @@ -762,37 +762,6 @@ Without file, the banner is prepended to the current buffer." (button-put button 'face 'default) (button-put button 'keymap hypb:hyperbole-banner-keymap))))) -(defun hypb:display-file-with-logo-xemacs (&optional file) - "Display an optional text FILE with the Hyperbole banner prepended. -Without file, the banner is prepended to the current buffer." - (let ((hyperbole-banner-path (expand-file-name "hyperbole-banner.png" hyperb:dir))) - (if (not (file-readable-p hyperbole-banner-path)) - (setq hyperbole-banner-path (if (fboundp 'locate-data-file) - (locate-data-file "hyperbole-banner.png") - (expand-file-name "hyperbole-banner.png" - data-directory)))) - (if (or (not (fboundp 'make-glyph)) - (let ((extent (next-extent (current-buffer)))) - (and extent (extent-property extent 'hyperbole-banner))) - (not hyperbole-banner-path) - (not (file-readable-p hyperbole-banner-path))) - ;; Either image support is unavailable, the file cannot be read - ;; or the image has already been inserted, so don't reinsert it. - nil - (let ((hyperbole-banner (make-glyph hyperbole-banner-path)) - (buffer-read-only) - extent) - (goto-char (point-min)) - (insert "\n") - (indent-to (startup-center-spaces hyperbole-banner)) - (insert "\n\n") - (setq extent (make-extent (- (point) 3) (- (point) 2))) - (set-extent-end-glyph extent hyperbole-banner) - (set-extent-property extent 'hyperbole-banner t) - (set-extent-property extent 'help-echo - (concat "Click to visit " hypb:home-page)) - (set-extent-property extent 'keymap hypb:hyperbole-banner-keymap))))) - (defun hypb:locate-pathnames () (save-excursion (goto-char (point-min))