[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs etc/NEWS lisp/ChangeLog lisp/obsolete/lev...
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] emacs etc/NEWS lisp/ChangeLog lisp/obsolete/lev... |
|
Date: |
Thu, 05 Nov 2009 21:17:26 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/11/05 21:17:25
Modified files:
etc : NEWS
lisp : ChangeLog
Added files:
lisp/obsolete : levents.el lucid.el
Removed files:
lisp/emacs-lisp: levents.el lucid.el
Log message:
* emacs-lisp/lucid.el: Move to obsolete/lucid.el.
* emacs-lisp/levents.el: Move to obsolete/levents.el.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2111&r2=1.2112
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16568&r2=1.16569
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/levents.el?cvsroot=emacs&r1=1.26&r2=0
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/lucid.el?cvsroot=emacs&r1=1.43&r2=0
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/obsolete/levents.el?cvsroot=emacs&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/obsolete/lucid.el?cvsroot=emacs&rev=1.1
Patches:
Index: etc/NEWS
===================================================================
RCS file: /sources/emacs/emacs/etc/NEWS,v
retrieving revision 1.2111
retrieving revision 1.2112
diff -u -b -r1.2111 -r1.2112
--- etc/NEWS 4 Nov 2009 03:15:43 -0000 1.2111
+++ etc/NEWS 5 Nov 2009 21:17:21 -0000 1.2112
@@ -135,6 +135,8 @@
* Changes in Specialized Modes and Packages in Emacs 23.2
+** lucid.el and levents.el are now declared obsolete.
+
** pcomplete provides a new command `pcomplete-std-completion' which
is similar to `pcomplete' but using the standard completion UI code.
Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16568
retrieving revision 1.16569
diff -u -b -r1.16568 -r1.16569
--- lisp/ChangeLog 5 Nov 2009 21:01:32 -0000 1.16568
+++ lisp/ChangeLog 5 Nov 2009 21:17:22 -0000 1.16569
@@ -1,5 +1,8 @@
2009-11-05 Stefan Monnier <address@hidden>
+ * emacs-lisp/lucid.el: Move to obsolete/lucid.el.
+ * emacs-lisp/levents.el: Move to obsolete/levents.el.
+
* nxml/xsd-regexp.el (xsdre-gen-categories):
* nxml/xmltok.el (xmltok-parse-entity):
* nxml/rng-parse.el (rng-parse-validate-file):
Index: lisp/obsolete/levents.el
===================================================================
RCS file: lisp/obsolete/levents.el
diff -N lisp/obsolete/levents.el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lisp/obsolete/levents.el 5 Nov 2009 21:17:25 -0000 1.1
@@ -0,0 +1,294 @@
+;;; levents.el --- emulate the Lucid event data type and associated functions
+
+;; Copyright (C) 1993, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
+;; Keywords: emulations
+;; Obsolete-since: 23.2
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Things we cannot emulate in Lisp:
+;; It is not possible to emulate current-mouse-event as a variable,
+;; though it is not hard to obtain the data from (this-command-keys).
+
+;; We do not have a variable unread-command-event;
+;; instead, we have the more general unread-command-events.
+
+;; Our read-key-sequence and read-char are not precisely
+;; compatible with those in Lucid Emacs, but they should work ok.
+
+;;; Code:
+
+(defun next-command-event (event)
+ (error "You must rewrite to use `read-command-event' instead of
`next-command-event'"))
+
+(defun next-event (event)
+ (error "You must rewrite to use `read-event' instead of `next-event'"))
+
+(defun dispatch-event (event)
+ (error "`dispatch-event' not supported"))
+
+;; Make events of type eval, menu and timeout
+;; execute properly.
+
+(define-key global-map [menu] 'execute-eval-event)
+(define-key global-map [timeout] 'execute-eval-event)
+(define-key global-map [eval] 'execute-eval-event)
+
+(defun execute-eval-event (event)
+ (interactive "e")
+ (funcall (nth 1 event) (nth 2 event)))
+
+(put 'eval 'event-symbol-elements '(eval))
+(put 'menu 'event-symbol-elements '(eval))
+(put 'timeout 'event-symbol-elements '(eval))
+
+(defun allocate-event ()
+ "Returns an empty event structure.
+In this emulation, it returns nil."
+ nil)
+
+(defun button-press-event-p (obj)
+ "True if the argument is a mouse-button-press event object."
+ (and (consp obj) (symbolp (car obj))
+ (memq 'down (get (car obj) 'event-symbol-elements))))
+
+(defun button-release-event-p (obj)
+ "True if the argument is a mouse-button-release event object."
+ (and (consp obj) (symbolp (car obj))
+ (or (memq 'click (get (car obj) 'event-symbol-elements))
+ (memq 'drag (get (car obj) 'event-symbol-elements)))))
+
+(defun button-event-p (obj)
+ "True if the argument is a mouse-button press or release event object."
+ (and (consp obj) (symbolp (car obj))
+ (or (memq 'click (get (car obj) 'event-symbol-elements))
+ (memq 'down (get (car obj) 'event-symbol-elements))
+ (memq 'drag (get (car obj) 'event-symbol-elements)))))
+
+(defun mouse-event-p (obj)
+ "True if the argument is a mouse-button press or release event object."
+ (and (consp obj) (symbolp (car obj))
+ (or (eq (car obj) 'mouse-movement)
+ (memq 'click (get (car obj) 'event-symbol-elements))
+ (memq 'down (get (car obj) 'event-symbol-elements))
+ (memq 'drag (get (car obj) 'event-symbol-elements)))))
+
+(defun character-to-event (ch &optional event)
+ "Converts a numeric ASCII value to an event structure, replete with
+bucky bits. The character is the first argument, and the event to fill
+in is the second. This function contains knowledge about what the codes
+mean -- for example, the number 9 is converted to the character Tab,
+not the distinct character Control-I.
+
+Beware that character-to-event and event-to-character are not strictly
+inverse functions, since events contain much more information than the
+ASCII character set can encode."
+ ch)
+
+(defun copy-event (event1 &optional event2)
+ "Make a copy of the given event object.
+In this emulation, `copy-event' just returns its argument."
+ event1)
+
+(defun deallocate-event (event)
+ "Allow the given event structure to be reused.
+In actual Lucid Emacs, you MUST NOT use this event object after
+calling this function with it. You will lose. It is not necessary to
+call this function, as event objects are garbage- collected like all
+other objects; however, it may be more efficient to explicitly
+deallocate events when you are sure that that is safe.
+
+This emulation does not actually deallocate or reuse events
+except via garbage collection and `cons'."
+ nil)
+
+(defun enqueue-eval-event: (function object)
+ "Add an eval event to the back of the queue.
+It will be the next event read after all pending events."
+ (setq unread-command-events
+ (nconc unread-command-events
+ (list (list 'eval function object)))))
+
+(defun eval-event-p (obj)
+ "True if the argument is an eval or menu event object."
+ (eq (car-safe obj) 'eval))
+
+(defun event-button (event)
+ "Return the button-number of the given mouse-button-press event."
+ (let ((sym (car (get (car event) 'event-symbol-elements))))
+ (cdr (assq sym '((mouse-1 . 1) (mouse-2 . 2) (mouse-3 . 3)
+ (mouse-4 . 4) (mouse-5 . 5))))))
+
+(defun event-function (event)
+ "Return the callback function of the given timeout, menu, or eval event."
+ (nth 1 event))
+
+(defun event-key (event)
+ "Returns the KeySym of the given key-press event.
+The value is an ASCII printing character (not upper case) or a symbol."
+ (if (symbolp event)
+ (car (get event 'event-symbol-elements))
+ (let ((base (logand event (1- (lsh 1 18)))))
+ (downcase (if (< base 32) (logior base 64) base)))))
+
+(defun event-object (event)
+ "Returns the function argument of the given timeout, menu, or eval event."
+ (nth 2 event))
+
+(defun event-point (event)
+ "Returns the character position of the given mouse-related event.
+If the event did not occur over a window, or did
+not occur over text, then this returns nil. Otherwise, it returns an index
+into the buffer visible in the event's window."
+ (posn-point (event-end event)))
+
+;; Return position of start of line LINE in WINDOW.
+;; If LINE is nil, return the last position
+;; visible in WINDOW.
+(defun event-closest-point-1 (window &optional line)
+ (let* ((total (- (window-height window)
+ (if (window-minibuffer-p window)
+ 0 1)))
+ (distance (or line total)))
+ (save-excursion
+ (goto-char (window-start window))
+ (if (= (vertical-motion distance) distance)
+ (if (not line)
+ (forward-char -1)))
+ (point))))
+
+(defun event-closest-point (event &optional start-window)
+ "Return the nearest position to where EVENT ended its motion.
+This is computed for the window where EVENT's motion started,
+or for window WINDOW if that is specified."
+ (or start-window (setq start-window (posn-window (event-start event))))
+ (if (eq start-window (posn-window (event-end event)))
+ (if (eq (event-point event) 'vertical-line)
+ (event-closest-point-1 start-window
+ (cdr (posn-col-row (event-end event))))
+ (if (eq (event-point event) 'mode-line)
+ (event-closest-point-1 start-window)
+ (event-point event)))
+ ;; EVENT ended in some other window.
+ (let* ((end-w (posn-window (event-end event)))
+ (end-w-top)
+ (w-top (nth 1 (window-edges start-window))))
+ (setq end-w-top
+ (if (windowp end-w)
+ (nth 1 (window-edges end-w))
+ (/ (cdr (posn-x-y (event-end event)))
+ (frame-char-height end-w))))
+ (if (>= end-w-top w-top)
+ (event-closest-point-1 start-window)
+ (window-start start-window)))))
+
+(defun event-process (event)
+ "Returns the process of the given process-output event."
+ (nth 1 event))
+
+(defun event-timestamp (event)
+ "Returns the timestamp of the given event object.
+In Lucid Emacs, this works for any kind of event.
+In this emulation, it returns nil for non-mouse-related events."
+ (and (listp event)
+ (posn-timestamp (event-end event))))
+
+(defun event-to-character (event &optional lenient)
+ "Returns the closest ASCII approximation to the given event object.
+If the event isn't a keypress, this returns nil.
+If the second argument is non-nil, then this is lenient in its
+translation; it will ignore modifier keys other than control and meta,
+and will ignore the shift modifier on those characters which have no
+shifted ASCII equivalent (Control-Shift-A for example, will be mapped to
+the same ASCII code as Control-A.) If the second arg is nil, then nil
+will be returned for events which have no direct ASCII equivalent."
+ (if (symbolp event)
+ (and lenient
+ (cdr (assq event '((backspace . 8) (delete . 127) (tab . 9)
+ (return . 10) (enter . 10)))))
+ ;; Our interpretation is, ASCII means anything a number can represent.
+ (if (integerp event)
+ event nil)))
+
+(defun event-window (event)
+ "Returns the window of the given mouse-related event object."
+ (posn-window (event-end event)))
+
+(defun event-x (event)
+ "Returns the X position in characters of the given mouse-related event."
+ (/ (car (posn-col-row (event-end event)))
+ (frame-char-width (window-frame (event-window event)))))
+
+(defun event-x-pixel (event)
+ "Returns the X position in pixels of the given mouse-related event."
+ (car (posn-col-row (event-end event))))
+
+(defun event-y (event)
+ "Returns the Y position in characters of the given mouse-related event."
+ (/ (cdr (posn-col-row (event-end event)))
+ (frame-char-height (window-frame (event-window event)))))
+
+(defun event-y-pixel (event)
+ "Returns the Y position in pixels of the given mouse-related event."
+ (cdr (posn-col-row (event-end event))))
+
+(defun key-press-event-p (obj)
+ "True if the argument is a keyboard event object."
+ (or (integerp obj)
+ (and (symbolp obj)
+ (get obj 'event-symbol-elements))))
+
+(defun menu-event-p (obj)
+ "True if the argument is a menu event object."
+ (eq (car-safe obj) 'menu))
+
+(defun motion-event-p (obj)
+ "True if the argument is a mouse-motion event object."
+ (eq (car-safe obj) 'mouse-movement))
+
+(defun read-command-event ()
+ "Return the next keyboard or mouse event; execute other events.
+This is similar to the function `next-command-event' of Lucid Emacs,
+but different in that it returns the event rather than filling in
+an existing event object."
+ (let (event)
+ (while (progn
+ (setq event (read-event))
+ (not (or (key-press-event-p event)
+ (button-press-event-p event)
+ (button-release-event-p event)
+ (menu-event-p event))))
+ (let ((type (car-safe event)))
+ (cond ((eq type 'eval)
+ (funcall (nth 1 event) (nth 2 event)))
+ ((eq type 'switch-frame)
+ (select-frame (nth 1 event))))))
+ event))
+
+(defun process-event-p (obj)
+ "True if the argument is a process-output event object.
+GNU Emacs 19 does not currently generate process-output events."
+ (eq (car-safe obj) 'process))
+
+(provide 'levents)
+
+;; arch-tag: a80c21da-69d7-46de-9cdb-5f68577b5525
+;;; levents.el ends here
Index: lisp/obsolete/lucid.el
===================================================================
RCS file: lisp/obsolete/lucid.el
diff -N lisp/obsolete/lucid.el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lisp/obsolete/lucid.el 5 Nov 2009 21:17:25 -0000 1.1
@@ -0,0 +1,238 @@
+;;; lucid.el --- emulate some Lucid Emacs functions
+
+;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
+;; Keywords: emulations
+;; Obsolete-since: 23.2
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+;; XEmacs autoloads CL so we might as well make use of it.
+(require 'cl)
+
+(defalias 'current-time-seconds 'current-time)
+
+(defun read-number (prompt &optional integers-only)
+ "Read a number from the minibuffer.
+Keep reentering the minibuffer until we get suitable input.
+If optional argument INTEGERS-ONLY is non-nil, insist on an integer."
+ (interactive)
+ (let (success
+ (number nil)
+ (predicate (if integers-only 'integerp 'numberp)))
+ (while (not success)
+ (let ((input-string (read-string prompt)))
+ (condition-case ()
+ (setq number (read input-string))
+ (error))
+ (if (funcall predicate number)
+ (setq success t)
+ (let ((cursor-in-echo-area t))
+ (message "Please type %s"
+ (if integers-only "an integer" "a number"))
+ (sit-for 1)))))
+ number))
+
+(defun real-path-name (name &optional default)
+ (file-truename (expand-file-name name default)))
+
+;; It's not clear what to return if the mouse is not in FRAME.
+(defun read-mouse-position (frame)
+ (let ((pos (mouse-position)))
+ (if (eq (car pos) frame)
+ (cdr pos))))
+
+(defun switch-to-other-buffer (arg)
+ "Switch to the previous buffer.
+With a numeric arg N, switch to the Nth most recent buffer.
+With an arg of 0, buries the current buffer at the
+bottom of the buffer stack."
+ (interactive "p")
+ (if (eq arg 0)
+ (bury-buffer (current-buffer)))
+ (switch-to-buffer
+ (if (<= arg 1) (other-buffer (current-buffer))
+ (nth arg
+ (apply 'nconc
+ (mapcar
+ (lambda (buf)
+ (if (= ?\ (string-to-char (buffer-name buf)))
+ nil
+ (list buf)))
+ (buffer-list)))))))
+
+(defun device-class (&optional device)
+ "Return the class (color behavior) of DEVICE.
+This will be one of 'color, 'grayscale, or 'mono.
+This function exists for compatibility with XEmacs."
+ (cond
+ ((display-color-p device) 'color)
+ ((display-grayscale-p device) 'grayscale)
+ (t 'mono)))
+
+(defalias 'find-face 'internal-find-face)
+(defalias 'get-face 'internal-get-face)
+;; internal-try-face-font was removed from faces.el in rev 1.139, 1999/07/21.
+;;;(defalias 'try-face-font 'internal-try-face-font)
+
+(defalias 'exec-to-string 'shell-command-to-string)
+
+
+;; Buffer context
+
+(defun buffer-syntactic-context (&optional buffer)
+ "Syntactic context at point in BUFFER.
+Either of `string', `comment' or nil.
+This is an XEmacs compatibility function."
+ (with-current-buffer (or buffer (current-buffer))
+ (let ((state (syntax-ppss (point))))
+ (cond
+ ((nth 3 state) 'string)
+ ((nth 4 state) 'comment)))))
+
+
+(defun buffer-syntactic-context-depth (&optional buffer)
+ "Syntactic parenthesis depth at point in BUFFER.
+This is an XEmacs compatibility function."
+ (with-current-buffer (or buffer (current-buffer))
+ (nth 0 (syntax-ppss (point)))))
+
+
+;; Extents
+(defun make-extent (beg end &optional buffer)
+ (make-overlay beg end buffer))
+
+(defun extent-properties (extent) (overlay-properties extent))
+(unless (fboundp 'extent-property) (defalias 'extent-property 'overlay-get))
+
+(defun extent-at (pos &optional object property before)
+ (with-current-buffer (or object (current-buffer))
+ (let ((overlays (overlays-at pos)))
+ (when property
+ (let (filtered)
+ (while overlays
+ (if (overlay-get (car overlays) property)
+ (setq filtered (cons (car overlays) filtered)))
+ (setq overlays (cdr overlays)))
+ (setq overlays filtered)))
+ (setq overlays
+ (sort overlays
+ (function (lambda (o1 o2)
+ (let ((p1 (or (overlay-get o1 'priority) 0))
+ (p2 (or (overlay-get o2 'priority) 0)))
+ (or (> p1 p2)
+ (and (= p1 p2)
+ (> (overlay-start o1) (overlay-start
o2)))))))))
+ (if before
+ (nth 1 (memq before overlays))
+ (car overlays)))))
+
+(defun set-extent-property (extent prop value)
+ ;; Make sure that separate adjacent extents
+ ;; with the same mouse-face value
+ ;; do not run together as one extent.
+ (and (eq prop 'mouse-face)
+ (symbolp value)
+ (setq value (list value)))
+ (if (eq prop 'duplicable)
+ (cond ((and value (not (overlay-get extent prop)))
+ ;; If becoming duplicable, copy all overlayprops to text props.
+ (add-text-properties (overlay-start extent)
+ (overlay-end extent)
+ (overlay-properties extent)
+ (overlay-buffer extent)))
+ ;; If becoming no longer duplicable, remove these text props.
+ ((and (not value) (overlay-get extent prop))
+ (remove-text-properties (overlay-start extent)
+ (overlay-end extent)
+ (overlay-properties extent)
+ (overlay-buffer extent))))
+ ;; If extent is already duplicable, put this property
+ ;; on the text as well as on the overlay.
+ (if (overlay-get extent 'duplicable)
+ (put-text-property (overlay-start extent)
+ (overlay-end extent)
+ prop value (overlay-buffer extent))))
+ (overlay-put extent prop value))
+
+(defun set-extent-face (extent face)
+ (set-extent-property extent 'face face))
+
+(defun set-extent-end-glyph (extent glyph)
+ (set-extent-property extent 'after-string glyph))
+
+(defun delete-extent (extent)
+ (set-extent-property extent 'duplicable nil)
+ (delete-overlay extent))
+
+;; Support the Lucid names with `screen' instead of `frame'.
+
+(defalias 'current-screen-configuration 'current-frame-configuration)
+(defalias 'delete-screen 'delete-frame)
+(defalias 'find-file-new-screen 'find-file-other-frame)
+(defalias 'find-file-read-only-new-screen 'find-file-read-only-other-frame)
+(defalias 'find-tag-new-screen 'find-tag-other-frame)
+;;(defalias 'focus-screen 'focus-frame)
+(defalias 'iconify-screen 'iconify-frame)
+(defalias 'mail-new-screen 'mail-other-frame)
+(defalias 'make-screen-invisible 'make-frame-invisible)
+(defalias 'make-screen-visible 'make-frame-visible)
+;; (defalias 'minibuffer-screen-list 'minibuffer-frame-list)
+(defalias 'modify-screen-parameters 'modify-frame-parameters)
+(defalias 'next-screen 'next-frame)
+;; (defalias 'next-multiscreen-window 'next-multiframe-window)
+;; (defalias 'previous-multiscreen-window 'previous-multiframe-window)
+;; (defalias 'redirect-screen-focus 'redirect-frame-focus)
+(defalias 'redraw-screen 'redraw-frame)
+;; (defalias 'screen-char-height 'frame-char-height)
+;; (defalias 'screen-char-width 'frame-char-width)
+;; (defalias 'screen-configuration-to-register
'frame-configuration-to-register)
+;; (defalias 'screen-focus 'frame-focus)
+(defalias 'screen-list 'frame-list)
+;; (defalias 'screen-live-p 'frame-live-p)
+(defalias 'screen-parameters 'frame-parameters)
+(defalias 'screen-pixel-height 'frame-pixel-height)
+(defalias 'screen-pixel-width 'frame-pixel-width)
+(defalias 'screen-root-window 'frame-root-window)
+(defalias 'screen-selected-window 'frame-selected-window)
+(defalias 'lower-screen 'lower-frame)
+(defalias 'raise-screen 'raise-frame)
+(defalias 'screen-visible-p 'frame-visible-p)
+(defalias 'screenp 'framep)
+(defalias 'select-screen 'select-frame)
+(defalias 'selected-screen 'selected-frame)
+;; (defalias 'set-screen-configuration 'set-frame-configuration)
+;; (defalias 'set-screen-height 'set-frame-height)
+(defalias 'set-screen-position 'set-frame-position)
+(defalias 'set-screen-size 'set-frame-size)
+;; (defalias 'set-screen-width 'set-frame-width)
+(defalias 'switch-to-buffer-new-screen 'switch-to-buffer-other-frame)
+;; (defalias 'unfocus-screen 'unfocus-frame)
+(defalias 'visible-screen-list 'visible-frame-list)
+(defalias 'window-screen 'window-frame)
+(defalias 'x-create-screen 'x-create-frame)
+(defalias 'x-new-screen 'make-frame)
+
+(provide 'lucid)
+
+;; arch-tag: 80f9ab46-0b36-4151-86ed-3edb6d449c9e
+;;; lucid.el ends here
Index: lisp/emacs-lisp/levents.el
===================================================================
RCS file: lisp/emacs-lisp/levents.el
diff -N lisp/emacs-lisp/levents.el
--- lisp/emacs-lisp/levents.el 5 Jan 2009 03:21:03 -0000 1.26
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,293 +0,0 @@
-;;; levents.el --- emulate the Lucid event data type and associated functions
-
-;; Copyright (C) 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-;; Maintainer: FSF
-;; Keywords: emulations
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Things we cannot emulate in Lisp:
-;; It is not possible to emulate current-mouse-event as a variable,
-;; though it is not hard to obtain the data from (this-command-keys).
-
-;; We do not have a variable unread-command-event;
-;; instead, we have the more general unread-command-events.
-
-;; Our read-key-sequence and read-char are not precisely
-;; compatible with those in Lucid Emacs, but they should work ok.
-
-;;; Code:
-
-(defun next-command-event (event)
- (error "You must rewrite to use `read-command-event' instead of
`next-command-event'"))
-
-(defun next-event (event)
- (error "You must rewrite to use `read-event' instead of `next-event'"))
-
-(defun dispatch-event (event)
- (error "`dispatch-event' not supported"))
-
-;; Make events of type eval, menu and timeout
-;; execute properly.
-
-(define-key global-map [menu] 'execute-eval-event)
-(define-key global-map [timeout] 'execute-eval-event)
-(define-key global-map [eval] 'execute-eval-event)
-
-(defun execute-eval-event (event)
- (interactive "e")
- (funcall (nth 1 event) (nth 2 event)))
-
-(put 'eval 'event-symbol-elements '(eval))
-(put 'menu 'event-symbol-elements '(eval))
-(put 'timeout 'event-symbol-elements '(eval))
-
-(defun allocate-event ()
- "Returns an empty event structure.
-In this emulation, it returns nil."
- nil)
-
-(defun button-press-event-p (obj)
- "True if the argument is a mouse-button-press event object."
- (and (consp obj) (symbolp (car obj))
- (memq 'down (get (car obj) 'event-symbol-elements))))
-
-(defun button-release-event-p (obj)
- "True if the argument is a mouse-button-release event object."
- (and (consp obj) (symbolp (car obj))
- (or (memq 'click (get (car obj) 'event-symbol-elements))
- (memq 'drag (get (car obj) 'event-symbol-elements)))))
-
-(defun button-event-p (obj)
- "True if the argument is a mouse-button press or release event object."
- (and (consp obj) (symbolp (car obj))
- (or (memq 'click (get (car obj) 'event-symbol-elements))
- (memq 'down (get (car obj) 'event-symbol-elements))
- (memq 'drag (get (car obj) 'event-symbol-elements)))))
-
-(defun mouse-event-p (obj)
- "True if the argument is a mouse-button press or release event object."
- (and (consp obj) (symbolp (car obj))
- (or (eq (car obj) 'mouse-movement)
- (memq 'click (get (car obj) 'event-symbol-elements))
- (memq 'down (get (car obj) 'event-symbol-elements))
- (memq 'drag (get (car obj) 'event-symbol-elements)))))
-
-(defun character-to-event (ch &optional event)
- "Converts a numeric ASCII value to an event structure, replete with
-bucky bits. The character is the first argument, and the event to fill
-in is the second. This function contains knowledge about what the codes
-mean -- for example, the number 9 is converted to the character Tab,
-not the distinct character Control-I.
-
-Beware that character-to-event and event-to-character are not strictly
-inverse functions, since events contain much more information than the
-ASCII character set can encode."
- ch)
-
-(defun copy-event (event1 &optional event2)
- "Make a copy of the given event object.
-In this emulation, `copy-event' just returns its argument."
- event1)
-
-(defun deallocate-event (event)
- "Allow the given event structure to be reused.
-In actual Lucid Emacs, you MUST NOT use this event object after
-calling this function with it. You will lose. It is not necessary to
-call this function, as event objects are garbage- collected like all
-other objects; however, it may be more efficient to explicitly
-deallocate events when you are sure that that is safe.
-
-This emulation does not actually deallocate or reuse events
-except via garbage collection and `cons'."
- nil)
-
-(defun enqueue-eval-event: (function object)
- "Add an eval event to the back of the queue.
-It will be the next event read after all pending events."
- (setq unread-command-events
- (nconc unread-command-events
- (list (list 'eval function object)))))
-
-(defun eval-event-p (obj)
- "True if the argument is an eval or menu event object."
- (eq (car-safe obj) 'eval))
-
-(defun event-button (event)
- "Return the button-number of the given mouse-button-press event."
- (let ((sym (car (get (car event) 'event-symbol-elements))))
- (cdr (assq sym '((mouse-1 . 1) (mouse-2 . 2) (mouse-3 . 3)
- (mouse-4 . 4) (mouse-5 . 5))))))
-
-(defun event-function (event)
- "Return the callback function of the given timeout, menu, or eval event."
- (nth 1 event))
-
-(defun event-key (event)
- "Returns the KeySym of the given key-press event.
-The value is an ASCII printing character (not upper case) or a symbol."
- (if (symbolp event)
- (car (get event 'event-symbol-elements))
- (let ((base (logand event (1- (lsh 1 18)))))
- (downcase (if (< base 32) (logior base 64) base)))))
-
-(defun event-object (event)
- "Returns the function argument of the given timeout, menu, or eval event."
- (nth 2 event))
-
-(defun event-point (event)
- "Returns the character position of the given mouse-related event.
-If the event did not occur over a window, or did
-not occur over text, then this returns nil. Otherwise, it returns an index
-into the buffer visible in the event's window."
- (posn-point (event-end event)))
-
-;; Return position of start of line LINE in WINDOW.
-;; If LINE is nil, return the last position
-;; visible in WINDOW.
-(defun event-closest-point-1 (window &optional line)
- (let* ((total (- (window-height window)
- (if (window-minibuffer-p window)
- 0 1)))
- (distance (or line total)))
- (save-excursion
- (goto-char (window-start window))
- (if (= (vertical-motion distance) distance)
- (if (not line)
- (forward-char -1)))
- (point))))
-
-(defun event-closest-point (event &optional start-window)
- "Return the nearest position to where EVENT ended its motion.
-This is computed for the window where EVENT's motion started,
-or for window WINDOW if that is specified."
- (or start-window (setq start-window (posn-window (event-start event))))
- (if (eq start-window (posn-window (event-end event)))
- (if (eq (event-point event) 'vertical-line)
- (event-closest-point-1 start-window
- (cdr (posn-col-row (event-end event))))
- (if (eq (event-point event) 'mode-line)
- (event-closest-point-1 start-window)
- (event-point event)))
- ;; EVENT ended in some other window.
- (let* ((end-w (posn-window (event-end event)))
- (end-w-top)
- (w-top (nth 1 (window-edges start-window))))
- (setq end-w-top
- (if (windowp end-w)
- (nth 1 (window-edges end-w))
- (/ (cdr (posn-x-y (event-end event)))
- (frame-char-height end-w))))
- (if (>= end-w-top w-top)
- (event-closest-point-1 start-window)
- (window-start start-window)))))
-
-(defun event-process (event)
- "Returns the process of the given process-output event."
- (nth 1 event))
-
-(defun event-timestamp (event)
- "Returns the timestamp of the given event object.
-In Lucid Emacs, this works for any kind of event.
-In this emulation, it returns nil for non-mouse-related events."
- (and (listp event)
- (posn-timestamp (event-end event))))
-
-(defun event-to-character (event &optional lenient)
- "Returns the closest ASCII approximation to the given event object.
-If the event isn't a keypress, this returns nil.
-If the second argument is non-nil, then this is lenient in its
-translation; it will ignore modifier keys other than control and meta,
-and will ignore the shift modifier on those characters which have no
-shifted ASCII equivalent (Control-Shift-A for example, will be mapped to
-the same ASCII code as Control-A.) If the second arg is nil, then nil
-will be returned for events which have no direct ASCII equivalent."
- (if (symbolp event)
- (and lenient
- (cdr (assq event '((backspace . 8) (delete . 127) (tab . 9)
- (return . 10) (enter . 10)))))
- ;; Our interpretation is, ASCII means anything a number can represent.
- (if (integerp event)
- event nil)))
-
-(defun event-window (event)
- "Returns the window of the given mouse-related event object."
- (posn-window (event-end event)))
-
-(defun event-x (event)
- "Returns the X position in characters of the given mouse-related event."
- (/ (car (posn-col-row (event-end event)))
- (frame-char-width (window-frame (event-window event)))))
-
-(defun event-x-pixel (event)
- "Returns the X position in pixels of the given mouse-related event."
- (car (posn-col-row (event-end event))))
-
-(defun event-y (event)
- "Returns the Y position in characters of the given mouse-related event."
- (/ (cdr (posn-col-row (event-end event)))
- (frame-char-height (window-frame (event-window event)))))
-
-(defun event-y-pixel (event)
- "Returns the Y position in pixels of the given mouse-related event."
- (cdr (posn-col-row (event-end event))))
-
-(defun key-press-event-p (obj)
- "True if the argument is a keyboard event object."
- (or (integerp obj)
- (and (symbolp obj)
- (get obj 'event-symbol-elements))))
-
-(defun menu-event-p (obj)
- "True if the argument is a menu event object."
- (eq (car-safe obj) 'menu))
-
-(defun motion-event-p (obj)
- "True if the argument is a mouse-motion event object."
- (eq (car-safe obj) 'mouse-movement))
-
-(defun read-command-event ()
- "Return the next keyboard or mouse event; execute other events.
-This is similar to the function `next-command-event' of Lucid Emacs,
-but different in that it returns the event rather than filling in
-an existing event object."
- (let (event)
- (while (progn
- (setq event (read-event))
- (not (or (key-press-event-p event)
- (button-press-event-p event)
- (button-release-event-p event)
- (menu-event-p event))))
- (let ((type (car-safe event)))
- (cond ((eq type 'eval)
- (funcall (nth 1 event) (nth 2 event)))
- ((eq type 'switch-frame)
- (select-frame (nth 1 event))))))
- event))
-
-(defun process-event-p (obj)
- "True if the argument is a process-output event object.
-GNU Emacs 19 does not currently generate process-output events."
- (eq (car-safe obj) 'process))
-
-(provide 'levents)
-
-;; arch-tag: a80c21da-69d7-46de-9cdb-5f68577b5525
-;;; levents.el ends here
Index: lisp/emacs-lisp/lucid.el
===================================================================
RCS file: lisp/emacs-lisp/lucid.el
diff -N lisp/emacs-lisp/lucid.el
--- lisp/emacs-lisp/lucid.el 5 Jan 2009 03:21:05 -0000 1.43
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,237 +0,0 @@
-;;; lucid.el --- emulate some Lucid Emacs functions
-
-;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-;; Maintainer: FSF
-;; Keywords: emulations
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-;; XEmacs autoloads CL so we might as well make use of it.
-(require 'cl)
-
-(defalias 'current-time-seconds 'current-time)
-
-(defun read-number (prompt &optional integers-only)
- "Read a number from the minibuffer.
-Keep reentering the minibuffer until we get suitable input.
-If optional argument INTEGERS-ONLY is non-nil, insist on an integer."
- (interactive)
- (let (success
- (number nil)
- (predicate (if integers-only 'integerp 'numberp)))
- (while (not success)
- (let ((input-string (read-string prompt)))
- (condition-case ()
- (setq number (read input-string))
- (error))
- (if (funcall predicate number)
- (setq success t)
- (let ((cursor-in-echo-area t))
- (message "Please type %s"
- (if integers-only "an integer" "a number"))
- (sit-for 1)))))
- number))
-
-(defun real-path-name (name &optional default)
- (file-truename (expand-file-name name default)))
-
-;; It's not clear what to return if the mouse is not in FRAME.
-(defun read-mouse-position (frame)
- (let ((pos (mouse-position)))
- (if (eq (car pos) frame)
- (cdr pos))))
-
-(defun switch-to-other-buffer (arg)
- "Switch to the previous buffer.
-With a numeric arg N, switch to the Nth most recent buffer.
-With an arg of 0, buries the current buffer at the
-bottom of the buffer stack."
- (interactive "p")
- (if (eq arg 0)
- (bury-buffer (current-buffer)))
- (switch-to-buffer
- (if (<= arg 1) (other-buffer (current-buffer))
- (nth arg
- (apply 'nconc
- (mapcar
- (lambda (buf)
- (if (= ?\ (string-to-char (buffer-name buf)))
- nil
- (list buf)))
- (buffer-list)))))))
-
-(defun device-class (&optional device)
- "Return the class (color behavior) of DEVICE.
-This will be one of 'color, 'grayscale, or 'mono.
-This function exists for compatibility with XEmacs."
- (cond
- ((display-color-p device) 'color)
- ((display-grayscale-p device) 'grayscale)
- (t 'mono)))
-
-(defalias 'find-face 'internal-find-face)
-(defalias 'get-face 'internal-get-face)
-;; internal-try-face-font was removed from faces.el in rev 1.139, 1999/07/21.
-;;;(defalias 'try-face-font 'internal-try-face-font)
-
-(defalias 'exec-to-string 'shell-command-to-string)
-
-
-;; Buffer context
-
-(defun buffer-syntactic-context (&optional buffer)
- "Syntactic context at point in BUFFER.
-Either of `string', `comment' or nil.
-This is an XEmacs compatibility function."
- (with-current-buffer (or buffer (current-buffer))
- (let ((state (syntax-ppss (point))))
- (cond
- ((nth 3 state) 'string)
- ((nth 4 state) 'comment)))))
-
-
-(defun buffer-syntactic-context-depth (&optional buffer)
- "Syntactic parenthesis depth at point in BUFFER.
-This is an XEmacs compatibility function."
- (with-current-buffer (or buffer (current-buffer))
- (nth 0 (syntax-ppss (point)))))
-
-
-;; Extents
-(defun make-extent (beg end &optional buffer)
- (make-overlay beg end buffer))
-
-(defun extent-properties (extent) (overlay-properties extent))
-(unless (fboundp 'extent-property) (defalias 'extent-property 'overlay-get))
-
-(defun extent-at (pos &optional object property before)
- (with-current-buffer (or object (current-buffer))
- (let ((overlays (overlays-at pos)))
- (when property
- (let (filtered)
- (while overlays
- (if (overlay-get (car overlays) property)
- (setq filtered (cons (car overlays) filtered)))
- (setq overlays (cdr overlays)))
- (setq overlays filtered)))
- (setq overlays
- (sort overlays
- (function (lambda (o1 o2)
- (let ((p1 (or (overlay-get o1 'priority) 0))
- (p2 (or (overlay-get o2 'priority) 0)))
- (or (> p1 p2)
- (and (= p1 p2)
- (> (overlay-start o1) (overlay-start
o2)))))))))
- (if before
- (nth 1 (memq before overlays))
- (car overlays)))))
-
-(defun set-extent-property (extent prop value)
- ;; Make sure that separate adjacent extents
- ;; with the same mouse-face value
- ;; do not run together as one extent.
- (and (eq prop 'mouse-face)
- (symbolp value)
- (setq value (list value)))
- (if (eq prop 'duplicable)
- (cond ((and value (not (overlay-get extent prop)))
- ;; If becoming duplicable, copy all overlayprops to text props.
- (add-text-properties (overlay-start extent)
- (overlay-end extent)
- (overlay-properties extent)
- (overlay-buffer extent)))
- ;; If becoming no longer duplicable, remove these text props.
- ((and (not value) (overlay-get extent prop))
- (remove-text-properties (overlay-start extent)
- (overlay-end extent)
- (overlay-properties extent)
- (overlay-buffer extent))))
- ;; If extent is already duplicable, put this property
- ;; on the text as well as on the overlay.
- (if (overlay-get extent 'duplicable)
- (put-text-property (overlay-start extent)
- (overlay-end extent)
- prop value (overlay-buffer extent))))
- (overlay-put extent prop value))
-
-(defun set-extent-face (extent face)
- (set-extent-property extent 'face face))
-
-(defun set-extent-end-glyph (extent glyph)
- (set-extent-property extent 'after-string glyph))
-
-(defun delete-extent (extent)
- (set-extent-property extent 'duplicable nil)
- (delete-overlay extent))
-
-;; Support the Lucid names with `screen' instead of `frame'.
-
-(defalias 'current-screen-configuration 'current-frame-configuration)
-(defalias 'delete-screen 'delete-frame)
-(defalias 'find-file-new-screen 'find-file-other-frame)
-(defalias 'find-file-read-only-new-screen 'find-file-read-only-other-frame)
-(defalias 'find-tag-new-screen 'find-tag-other-frame)
-;;(defalias 'focus-screen 'focus-frame)
-(defalias 'iconify-screen 'iconify-frame)
-(defalias 'mail-new-screen 'mail-other-frame)
-(defalias 'make-screen-invisible 'make-frame-invisible)
-(defalias 'make-screen-visible 'make-frame-visible)
-;; (defalias 'minibuffer-screen-list 'minibuffer-frame-list)
-(defalias 'modify-screen-parameters 'modify-frame-parameters)
-(defalias 'next-screen 'next-frame)
-;; (defalias 'next-multiscreen-window 'next-multiframe-window)
-;; (defalias 'previous-multiscreen-window 'previous-multiframe-window)
-;; (defalias 'redirect-screen-focus 'redirect-frame-focus)
-(defalias 'redraw-screen 'redraw-frame)
-;; (defalias 'screen-char-height 'frame-char-height)
-;; (defalias 'screen-char-width 'frame-char-width)
-;; (defalias 'screen-configuration-to-register
'frame-configuration-to-register)
-;; (defalias 'screen-focus 'frame-focus)
-(defalias 'screen-list 'frame-list)
-;; (defalias 'screen-live-p 'frame-live-p)
-(defalias 'screen-parameters 'frame-parameters)
-(defalias 'screen-pixel-height 'frame-pixel-height)
-(defalias 'screen-pixel-width 'frame-pixel-width)
-(defalias 'screen-root-window 'frame-root-window)
-(defalias 'screen-selected-window 'frame-selected-window)
-(defalias 'lower-screen 'lower-frame)
-(defalias 'raise-screen 'raise-frame)
-(defalias 'screen-visible-p 'frame-visible-p)
-(defalias 'screenp 'framep)
-(defalias 'select-screen 'select-frame)
-(defalias 'selected-screen 'selected-frame)
-;; (defalias 'set-screen-configuration 'set-frame-configuration)
-;; (defalias 'set-screen-height 'set-frame-height)
-(defalias 'set-screen-position 'set-frame-position)
-(defalias 'set-screen-size 'set-frame-size)
-;; (defalias 'set-screen-width 'set-frame-width)
-(defalias 'switch-to-buffer-new-screen 'switch-to-buffer-other-frame)
-;; (defalias 'unfocus-screen 'unfocus-frame)
-(defalias 'visible-screen-list 'visible-frame-list)
-(defalias 'window-screen 'window-frame)
-(defalias 'x-create-screen 'x-create-frame)
-(defalias 'x-new-screen 'make-frame)
-
-(provide 'lucid)
-
-;; arch-tag: 80f9ab46-0b36-4151-86ed-3edb6d449c9e
-;;; lucid.el ends here
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs etc/NEWS lisp/ChangeLog lisp/obsolete/lev...,
Stefan Monnier <=