[Emacs-diffs] Changes to emacs/lisp/frame.el

[Juri Linkov]

Index: emacs/lisp/frame.el
diff -c emacs/lisp/frame.el:1.231 emacs/lisp/frame.el:1.232
*** emacs/lisp/frame.el:1.231   Tue Dec  6 12:43:47 2005
--- emacs/lisp/frame.el Sun Dec 11 11:08:20 2005
***************
*** 886,892 ****
    "Set the background color of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current background color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color)))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'background-color color-name)))
    (or window-system
--- 886,892 ----
    "Set the background color of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current background color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color "Background color: ")))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'background-color color-name)))
    (or window-system
***************
*** 896,902 ****
    "Set the foreground color of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current foreground color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color)))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'foreground-color color-name)))
    (or window-system
--- 896,902 ----
    "Set the foreground color of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current foreground color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color "Foreground color: ")))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'foreground-color color-name)))
    (or window-system
***************
*** 906,912 ****
    "Set the text cursor color of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current cursor color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color)))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'cursor-color color-name))))
  
--- 906,912 ----
    "Set the text cursor color of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current cursor color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color "Cursor color: ")))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'cursor-color color-name))))
  
***************
*** 914,920 ****
    "Set the color of the mouse pointer of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current mouse color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color)))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'mouse-color
                                       (or color-name
--- 914,920 ----
    "Set the color of the mouse pointer of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current mouse color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color "Mouse color: ")))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'mouse-color
                                       (or color-name
***************
*** 925,931 ****
    "Set the color of the border of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current border color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color)))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'border-color color-name))))
  
--- 925,931 ----
    "Set the color of the border of the selected frame to COLOR-NAME.
  When called interactively, prompt for the name of the color to use.
  To get the frame's current border color, use `frame-parameters'."
!   (interactive (list (facemenu-read-color "Border color: ")))
    (modify-frame-parameters (selected-frame)
                           (list (cons 'border-color color-name))))
  
***************
*** 1203,1209 ****
  (defcustom show-trailing-whitespace nil
    "*Non-nil means highlight trailing whitespace.
  This is done in the face `trailing-whitespace'."
-   :tag "Highlight trailing whitespace."
    :type 'boolean
    :group 'whitespace-faces)
  
--- 1203,1208 ----
***************
*** 1235,1247 ****
  
  (defcustom blink-cursor-delay 0.5
    "*Seconds of idle time after which cursor starts to blink."
-   :tag "Delay in seconds."
    :type 'number
    :group 'cursor)
  
  (defcustom blink-cursor-interval 0.5
    "*Length of cursor blink interval in seconds."
-   :tag "Blink interval in seconds."
    :type 'number
    :group 'cursor)
  
--- 1234,1244 ----
***************
*** 1317,1330 ****
  ;; Hourglass pointer
  
  (defcustom display-hourglass t
!   "*Non-nil means show an hourglass pointer when running under a window 
system."
!   :tag "Hourglass pointer"
    :type 'boolean
    :group 'cursor)
  
  (defcustom hourglass-delay 1
!   "*Seconds to wait before displaying an hourglass pointer."
!   :tag "Hourglass delay"
    :type 'number
    :group 'cursor)
  
--- 1314,1325 ----
  ;; Hourglass pointer
  
  (defcustom display-hourglass t
!   "*Non-nil to show an hourglass pointer when Emacs is busy on a window 
system."
    :type 'boolean
    :group 'cursor)
  
  (defcustom hourglass-delay 1
!   "*Seconds to wait before displaying an hourglass pointer when Emacs is 
busy."
    :type 'number
    :group 'cursor)
  
***************
*** 1333,1339 ****
    "*Non-nil means show a hollow box cursor in non-selected windows.
  If nil, don't show a cursor except in the selected window.
  Use Custom to set this variable to get the display updated."
!   :tag "Cursor in non-selected windows"
    :type 'boolean
    :group 'cursor
    :set #'(lambda (symbol value)
--- 1328,1334 ----
    "*Non-nil means show a hollow box cursor in non-selected windows.
  If nil, don't show a cursor except in the selected window.
  Use Custom to set this variable to get the display updated."
!   :tag "Cursor In Non-selected Windows"
    :type 'boolean
    :group 'cursor
    :set #'(lambda (symbol value)