mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

Removed unnecessary tests for GUI sessions and created menu faces.

Browse Source
This commit is contained in:
Eli Zaretskii 2013-09-05 15:43:11 +03:00
parent e7873136dd
commit 5877bb8d7e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/dired.el
View File

@ -4352,7 +4352,7 @@ instead.
;;;***
;;;### (autoloads nil "dired-x" "dired-x.el" "1419d865898f84c17f172320e578380c")
;;;### (autoloads nil "dired-x" "dired-x.el" "130484d4c94bb9929c210774f9e475f5")
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\

11
lisp/faces.el
View File

@ -2135,8 +2135,15 @@ terminal type to a different value."
(defun tty-set-up-initial-frame-faces ()
(let ((frame (selected-frame)))
(frame-set-background-mode frame t)
(face-set-after-frame-default frame)))
(face-set-after-frame-default frame)
(make-face 'tty-menu-enabled-face)
(make-face 'tty-menu-disabled-face)
(make-face 'tty-menu-selected-face)
(set-face-foreground 'tty-menu-enabled-face "yellow")
(set-face-foreground 'tty-menu-disabled-face "white")
(set-face-background 'tty-menu-enabled-face "blue")
(set-face-background 'tty-menu-disabled-face "blue")
(set-face-background 'tty-menu-selected-face "red")))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

7
src/menu.c
View File

@ -1077,8 +1077,6 @@ no quit occurs and `x-popup-menu' returns nil. */)
{
bool get_current_pos_p = 0;
check_window_system (SELECTED_FRAME ());
/* Decode the first argument: find the window and the coordinates. */
if (EQ (position, Qt)
|| (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
@ -1194,11 +1192,6 @@ no quit occurs and `x-popup-menu' returns nil. */)
xpos += XINT (x);
ypos += XINT (y);
/* FIXME: Find a more general check! */
if (!(FRAME_X_P (f) || FRAME_MSDOS_P (f)
|| FRAME_W32_P (f) || FRAME_NS_P (f)))
error ("Can not put GUI menu on this terminal");
XSETFRAME (Vmenu_updating_frame, f);
}
#endif /* HAVE_MENUS */