aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog24
-rw-r--r--lisp/dframe.el8
2 files changed, 19 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1bcbb57c21c..655f856d801 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12008-11-04 Juanma Barranquero <lekktu@gmail.com>
2
3 * dframe.el (dframe-mouse-position-function)
4 (dframe-reposition-frame-emacs, dframe-pass-event-to-popup-mode-menu)
5 (dframe-mouse-set-point): Fix typos in docstrings.
6
12008-11-04 Dan Nicolaescu <dann@ics.uci.edu> 72008-11-04 Dan Nicolaescu <dann@ics.uci.edu>
2 8
3 * vc-dir.el (vc-dir-headers): Undo previous change. 9 * vc-dir.el (vc-dir-headers): Undo previous change.
@@ -29,8 +35,8 @@
29 35
30 * subr.el (looking-back): Doc fix. 36 * subr.el (looking-back): Doc fix.
31 37
32 * term/x-win.el (x-initialize-window-system): Call 38 * term/x-win.el (x-initialize-window-system):
33 x-wm-set-size-hint after initialization. 39 Call x-wm-set-size-hint after initialization.
34 40
35 * eshell/em-hist.el (eshell-save-history-on-exit): Change default 41 * eshell/em-hist.el (eshell-save-history-on-exit): Change default
36 to t. 42 to t.
@@ -47,20 +53,20 @@
47 53
482008-11-02 Martin Rudalics <rudalics@gmx.at> 542008-11-02 Martin Rudalics <rudalics@gmx.at>
49 55
50 * window.el (save-selected-window-norecord): New macro 56 * window.el (save-selected-window-norecord): New macro.
51 (walk-windows): Use save-selected-window-norecord and call 57 (walk-windows): Use save-selected-window-norecord and call
52 select-window with NORECORD set. (Bug#1237) 58 select-window with NORECORD set. (Bug#1237)
53 (set-window-text-height, fit-window-to-buffer): Use 59 (set-window-text-height, fit-window-to-buffer):
54 save-selected-window-norecord and call select-window with 60 Use save-selected-window-norecord and call select-window with
55 NORECORD set. 61 NORECORD set.
56 * subr.el (with-selected-window): Call set-frame-selected-window 62 * subr.el (with-selected-window): Call set-frame-selected-window
57 with new argument NORECORD set. Update doc-string. 63 with new argument NORECORD set. Update doc-string.
58 (with-selected-frame): Call select-frame with new argument 64 (with-selected-frame): Call select-frame with new argument
59 NORECORD set. Update doc-string. 65 NORECORD set. Update doc-string.
60 * emacs-lisp/lisp-mode.el (save-selected-window-norecord): Put 66 * emacs-lisp/lisp-mode.el (save-selected-window-norecord):
61 indent-function for save-selected-window-norecord. 67 Put indent-function for save-selected-window-norecord.
62 * font-lock.el (lisp-font-lock-keywords-2): Add 68 * font-lock.el (lisp-font-lock-keywords-2):
63 save-selected-window-norecord. 69 Add save-selected-window-norecord.
64 70
652008-11-01 Juanma Barranquero <lekktu@gmail.com> 712008-11-01 Juanma Barranquero <lekktu@gmail.com>
66 72
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 2086347dc90..7cb5c2684fa 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -173,7 +173,7 @@ Valid clicks are mouse 2, our double mouse 1.")
173(make-variable-buffer-local 'dframe-mouse-click-function) 173(make-variable-buffer-local 'dframe-mouse-click-function)
174 174
175(defvar dframe-mouse-position-function nil 175(defvar dframe-mouse-position-function nil
176 "*A function to called to position the cursor for a mouse click.") 176 "*A function to call to position the cursor for a mouse click.")
177(make-variable-buffer-local 'dframe-mouse-position-function) 177(make-variable-buffer-local 'dframe-mouse-position-function)
178 178
179(defvar dframe-power-click nil 179(defvar dframe-power-click nil
@@ -424,7 +424,7 @@ LOCATION can be one of 'random, 'left, 'right, 'left-right, or 'top-bottom."
424(defun dframe-reposition-frame-emacs (new-frame parent-frame location) 424(defun dframe-reposition-frame-emacs (new-frame parent-frame location)
425 "Move NEW-FRAME to be relative to PARENT-FRAME. 425 "Move NEW-FRAME to be relative to PARENT-FRAME.
426LOCATION can be one of 'random, 'left-right, 'top-bottom, or 426LOCATION can be one of 'random, 'left-right, 'top-bottom, or
427a cons cell indicationg a position of the form (LEFT . TOP)." 427a cons cell indicating a position of the form (LEFT . TOP)."
428 ;; Position dframe. 428 ;; Position dframe.
429 ;; Do no positioning if not on a windowing system, 429 ;; Do no positioning if not on a windowing system,
430 (unless (or (not window-system) (eq window-system 'pc)) 430 (unless (or (not window-system) (eq window-system 'pc))
@@ -766,7 +766,7 @@ Evaluates all cached timer functions in sequence."
766 (fboundp 'function-max-args) 766 (fboundp 'function-max-args)
767 (setq max-args (function-max-args 'popup-mode-menu)) 767 (setq max-args (function-max-args 'popup-mode-menu))
768 (not (zerop max-args)))) 768 (not (zerop max-args))))
769 "The EVENT arg to 'popup-mode-menu' was introduced in XEmacs 21.4.0.") 769 "The EVENT arg to `popup-mode-menu' was introduced in XEmacs 21.4.0.")
770 770
771;; In XEmacs, we make popup menus work on the item over mouse (as 771;; In XEmacs, we make popup menus work on the item over mouse (as
772;; opposed to where the point happens to be.) We attain this by 772;; opposed to where the point happens to be.) We attain this by
@@ -852,7 +852,7 @@ BUFFER and POSITION are optional because XEmacs doesn't use them."
852 (funcall dframe-help-echo-function)))))) 852 (funcall dframe-help-echo-function))))))
853 853
854(defun dframe-mouse-set-point (e) 854(defun dframe-mouse-set-point (e)
855 "Set POINT based on event E. 855 "Set point based on event E.
856Handles clicking on images in XEmacs." 856Handles clicking on images in XEmacs."
857 (if (and (featurep 'xemacs) 857 (if (and (featurep 'xemacs)
858 (save-excursion 858 (save-excursion