/[emacs]/emacs/lisp/frame.el
ViewVC logotype

Diff of /emacs/lisp/frame.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.186 by eliz, Sat Nov 3 15:53:58 2001 UTC revision 1.187 by sds, Mon Nov 26 18:20:20 2001 UTC
# Line 244  React to settings of `default-frame-alis Line 244  React to settings of `default-frame-alis
244          (setq default-frame-alist          (setq default-frame-alist
245                (cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))                (cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))
246                      default-frame-alist)))))                      default-frame-alist)))))
247      
248    ;; Make tool-bar-mode and default-frame-alist consistent.  Don't do    ;; Make tool-bar-mode and default-frame-alist consistent.  Don't do
249    ;; it in batch mode since that would leave a tool-bar-lines    ;; it in batch mode since that would leave a tool-bar-lines
250    ;; parameter in default-frame-alist in a dumped Emacs, which is not    ;; parameter in default-frame-alist in a dumped Emacs, which is not
# Line 324  React to settings of `default-frame-alis Line 324  React to settings of `default-frame-alis
324                     (relief (if (and (integerp tool-bar-button-relief)                     (relief (if (and (integerp tool-bar-button-relief)
325                                      (> tool-bar-button-relief 0))                                      (> tool-bar-button-relief 0))
326                                 tool-bar-button-relief 3))                                 tool-bar-button-relief 3))
327                     (lines (/ (+ image-height                     (lines (/ (+ image-height
328                                  (* 2 margin)                                  (* 2 margin)
329                                  (* 2 relief)                                  (* 2 relief)
330                                  (1- char-height))                                  (1- char-height))
331                               char-height))                               char-height))
332                     (height (frame-parameter frame-initial-frame 'height))                     (height (frame-parameter frame-initial-frame 'height))
333                     (newparms (list (cons 'height (- height lines))))                     (newparms (list (cons 'height (- height lines))))
334                     (initial-top (cdr (assq 'top                     (initial-top (cdr (assq 'top
335                                             frame-initial-geometry-arguments)))                                             frame-initial-geometry-arguments)))
336                     (top (frame-parameter frame-initial-frame 'top)))                     (top (frame-parameter frame-initial-frame 'top)))
337                (when (and (consp initial-top) (eq '- (car initial-top)))                (when (and (consp initial-top) (eq '- (car initial-top)))
338                  (setq newparms                  (setq newparms
339                        (append newparms                        (append newparms
340                                `((top . ,(+ top (* lines char-height))))                                `((top . ,(+ top (* lines char-height))))
341                                nil)))                                nil)))
342                (modify-frame-parameters frame-initial-frame newparms)                (modify-frame-parameters frame-initial-frame newparms)
# Line 368  React to settings of `default-frame-alis Line 368  React to settings of `default-frame-alis
368                (sleep-for 1))                (sleep-for 1))
369              (setq parms (frame-parameters frame-initial-frame))              (setq parms (frame-parameters frame-initial-frame))
370    
371         ;; Get rid of `name' unless it was specified explicitly before.              ;; Get rid of `name' unless it was specified explicitly before.
372              (or (assq 'name frame-initial-frame-alist)              (or (assq 'name frame-initial-frame-alist)
373                  (setq parms (delq (assq 'name parms) parms)))                  (setq parms (delq (assq 'name parms) parms)))
374    
# Line 464  React to settings of `default-frame-alis Line 464  React to settings of `default-frame-alis
464            (setq tail allparms)            (setq tail allparms)
465            ;; Find just the parms that have changed since we first            ;; Find just the parms that have changed since we first
466            ;; made this frame.  Those are the ones actually set by            ;; made this frame.  Those are the ones actually set by
467         ;; the init file.  For those parms whose values we already knew            ;; the init file.  For those parms whose values we already knew
468            ;; (such as those spec'd by command line options)            ;; (such as those spec'd by command line options)
469            ;; it is undesirable to specify the parm again            ;; it is undesirable to specify the parm again
470           ;; once the user has seen the frame and been able to alter it            ;; once the user has seen the frame and been able to alter it
471            ;; manually.            ;; manually.
472            (while tail            (while tail
473              (let (newval oldval)              (let (newval oldval)
# Line 789  If FRAME is omitted, describe the curren Line 789  If FRAME is omitted, describe the curren
789    "Set the font of the selected frame to FONT-NAME.    "Set the font of the selected frame to FONT-NAME.
790  When called interactively, prompt for the name of the font to use.  When called interactively, prompt for the name of the font to use.
791  To get the frame's current default font, use `frame-parameters'."  To get the frame's current default font, use `frame-parameters'."
792    (interactive    (interactive
793     (list     (list
794      (let ((completion-ignore-case t))      (let ((completion-ignore-case t))
795        (completing-read "Font name: "        (completing-read "Font name: "
# Line 1230  command starts, by installing a pre-comm Line 1230  command starts, by installing a pre-comm
1230  (defun blink-cursor-end ()  (defun blink-cursor-end ()
1231    "Stop cursor blinking.    "Stop cursor blinking.
1232  This is installed as a pre-command hook by `blink-cursor-start'.  This is installed as a pre-command hook by `blink-cursor-start'.
1233  When run, it cancels the timer `blink-cursor-timer' and removes  When run, it cancels the timer `blink-cursor-timer' and removes
1234  itself as a pre-command hook."  itself as a pre-command hook."
1235    (remove-hook 'pre-command-hook 'blink-cursor-end)    (remove-hook 'pre-command-hook 'blink-cursor-end)
1236    (internal-show-cursor nil t)    (internal-show-cursor nil t)
# Line 1257  itself as a pre-command hook." Line 1257  itself as a pre-command hook."
1257  (defcustom cursor-in-non-selected-windows t  (defcustom cursor-in-non-selected-windows t
1258    "*Non-nil means show a hollow box cursor in non-selected-windows.    "*Non-nil means show a hollow box cursor in non-selected-windows.
1259  If nil, don't show a cursor except in the selected window.  If nil, don't show a cursor except in the selected window.
1260  Use Custom to set this variable to get the display updated."  Use Custom to set this variable to get the display updated."
1261    :tag "Cursor in non-selected windows"    :tag "Cursor in non-selected windows"
1262    :type 'boolean    :type 'boolean
1263    :group 'cursor    :group 'cursor
1264    :set #'(lambda (symbol value)    :set #'(lambda (symbol value)
1265             (set-default symbol value)             (set-default symbol value)
1266             (force-mode-line-update t)))             (force-mode-line-update t)))
1267      
1268    
1269  ;;;; Key bindings  ;;;; Key bindings
1270    

Legend:
Removed from v.1.186  
changed lines
  Added in v.1.187

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26