(log-view-goto-rev): New function for the new VC.

[gnu-emacs] / lisp / frame.el

diff --git a/lisp/frame.el b/lisp/frame.el
index 394652d53101cc27af7d1aaba53f67b05ab284bf..5b7709b69b489a14b102535c9d5e3ebed0049467 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -290,13 +290,13 @@ React to settings of `default-frame-alist', `initial-frame-alist' there."
              ;; when we first made the frame.
              (setq parms (cons '(reverse) (delq (assq 'reverse parms) parms)))
              (if (assq 'height frame-initial-geometry-arguments)
-                 (setq parms (assoc-delete-all 'height parms)))
+                 (setq parms (assq-delete-all 'height parms)))
              (if (assq 'width frame-initial-geometry-arguments)
-                 (setq parms (assoc-delete-all 'width parms)))
+                 (setq parms (assq-delete-all 'width parms)))
              (if (assq 'left frame-initial-geometry-arguments)
-                 (setq parms (assoc-delete-all 'left parms)))
+                 (setq parms (assq-delete-all 'left parms)))
              (if (assq 'top frame-initial-geometry-arguments)
-                 (setq parms (assoc-delete-all 'top parms)))
+                 (setq parms (assq-delete-all 'top parms)))
              (setq new
                    (make-frame
                     ;; Use the geometry args that created the existing
@@ -362,13 +362,13 @@ React to settings of `default-frame-alist', `initial-frame-alist' there."
            (setq allparms (append initial-frame-alist
                                   default-frame-alist))
            (if (assq 'height frame-initial-geometry-arguments)
-               (setq allparms (assoc-delete-all 'height allparms)))
+               (setq allparms (assq-delete-all 'height allparms)))
            (if (assq 'width frame-initial-geometry-arguments)
-               (setq allparms (assoc-delete-all 'width allparms)))
+               (setq allparms (assq-delete-all 'width allparms)))
            (if (assq 'left frame-initial-geometry-arguments)
-               (setq allparms (assoc-delete-all 'left allparms)))
+               (setq allparms (assq-delete-all 'left allparms)))
            (if (assq 'top frame-initial-geometry-arguments)
-               (setq allparms (assoc-delete-all 'top allparms)))
+               (setq allparms (assq-delete-all 'top allparms)))
            (setq tail allparms)
            ;; Find just the parms that have changed since we first
            ;; made this frame.  Those are the ones actually set by
@@ -574,13 +574,17 @@ A negative ARG moves in the opposite order."
       (while (not (eq (frame-visible-p frame) t))
        (setq frame (previous-frame frame)))
       (setq arg (1+ arg)))
-    (raise-frame frame)
     (select-frame frame)
+    (raise-frame frame)
     ;; Ensure, if possible, that frame gets input focus.
-    (if (eq window-system 'w32)
-       (w32-focus-frame frame)
-      (when focus-follows-mouse
-       (set-mouse-position (selected-frame) (1- (frame-width)) 0)))))
+    (when (eq window-system 'w32)
+      (w32-focus-frame frame))
+    (cond (focus-follows-mouse
+          (unless (eq window-system 'w32)
+            (set-mouse-position (selected-frame) (1- (frame-width)) 0)))
+         (t
+          (when (eq window-system 'x)
+            (x-focus-frame frame))))))
 
 (defun make-frame-names-alist ()
   (let* ((current-frame (selected-frame))
@@ -991,6 +995,22 @@ FRAME nil or omitted means delete all frames except the selected frame."
   :group 'font-lock)
 
 
+\f
+;;; Scrolling
+
+(defgroup scrolling nil
+  "Scrolling windows."
+  :version "21.1"
+  :group 'frames)
+
+(defcustom automatic-hscrolling t
+  "*Allow or disallow autmatic scrolling windows horizontally.
+If non-nil, windows are automatically scrolled horizontally to make
+point visible."
+  :version "21.1"
+  :type 'boolean
+  :group 'scrolling)
+
 \f
 ;;; Blinking cursor
 
@@ -1046,7 +1066,8 @@ window blinks."
                (run-with-idle-timer blink-cursor-delay
                                     blink-cursor-delay
                                     'blink-cursor-start))
-         (setq blink-cursor-mode t)))))
+         (setq blink-cursor-mode t))
+      (internal-show-cursor nil t))))
 
 (defcustom blink-cursor (not (eq system-type 'ms-dos))
   "*Non-nil means blinking cursor mode is active."
@@ -1096,7 +1117,29 @@ itself as a pre-command hook."
           (set-default symbol value)
           (setq display-busy-cursor value)))
 
+(defcustom busy-cursor-delay-seconds 1
+  "*Seconds to wait before displaying a busy-cursor."
+  :tag "Busy-cursor delay"
+  :type 'number
+  :group 'cursor
+  :get #'(lambda (symbol) busy-cursor-delay)
+  :set #'(lambda (symbol value)
+          (set-default symbol value)
+          (setq busy-cursor-delay value)))
 
+\f
+(defcustom show-cursor-in-non-selected-windows t
+  "*Non-nil means show a hollow box cursor in non-selected-windows.
+If nil, don't show a cursor except in the selected window."
+  :tag "Cursor in non-selected windows"
+  :type 'boolean
+  :group 'cursor
+  :get #'(lambda (symbol) cursor-in-non-selected-windows)
+  :set #'(lambda (symbol value)
+          (set-default symbol value)
+          (setq cursor-in-non-selected-windows value)
+          (force-mode-line-update t)))
+  
 \f
 ;;;; Key bindings