aboutsummaryrefslogtreecommitdiffstats
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorGlenn Morris2018-02-13 14:22:16 -0800
committerGlenn Morris2018-02-13 14:22:16 -0800
commit4bee1b8bacb9ce6107ea605da464d01f6bd3aa7d (patch)
treedc5dc2098f8956b66620cc1003601f705c289cd2 /src/xmenu.c
parent6c7186de3bbb2b7652cdc01a68bee035761197e5 (diff)
downloademacs-4bee1b8bacb9ce6107ea605da464d01f6bd3aa7d.tar.gz
emacs-4bee1b8bacb9ce6107ea605da464d01f6bd3aa7d.zip
Stop keeping multiple doc copies for items defined multiple times
It was always a nuisance to keep all the copies in sync. * src/doc.c (Fsnarf_documentation): Don't skip entire files. Instead, skip individual doc strings starting with "SKIP". * doc/lispref/internals.texi (Writing Emacs Primitives): Mention this skipping. * lisp/term/ns-win.el, lisp/term/pc-win.el, src/dosfns.c: * src/frame.c, src/nsfns.m, src/nsmenu.m, src/nsterm.m: * src/w16select.c, src/w32fns.c, src/w32menu.c, src/w32select.c: * src/w32term.c, src/xmenu.c: Remove duplicated doc strings. * src/xfns.c: Merge in information from doc string duplicates.
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index e7ef31ac564..835db9191f1 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -278,12 +278,7 @@ popup_get_selection (XEvent *initial_event, struct x_display_info *dpyinfo,
278} 278}
279 279
280DEFUN ("x-menu-bar-open-internal", Fx_menu_bar_open_internal, Sx_menu_bar_open_internal, 0, 1, "i", 280DEFUN ("x-menu-bar-open-internal", Fx_menu_bar_open_internal, Sx_menu_bar_open_internal, 0, 1, "i",
281 doc: /* Start key navigation of the menu bar in FRAME. 281 doc: /* SKIP: real doc in USE_GTK definition in xmenu.c. */)
282This initially opens the first menu bar item and you can then navigate with the
283arrow keys, select a menu entry with the return key or cancel with the
284escape key. If FRAME has no menu bar this function does nothing.
285
286If FRAME is nil or not given, use the selected frame. */)
287 (Lisp_Object frame) 282 (Lisp_Object frame)
288{ 283{
289 XEvent ev; 284 XEvent ev;
@@ -2376,7 +2371,8 @@ popup_activated (void)
2376/* The following is used by delayed window autoselection. */ 2371/* The following is used by delayed window autoselection. */
2377 2372
2378DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, 2373DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0,
2379 doc: /* Return t if a menu or popup dialog is active. */) 2374 doc: /* Return t if a menu or popup dialog is active.
2375\(On MS Windows, this refers to the selected frame.) */)
2380 (void) 2376 (void)
2381{ 2377{
2382 return (popup_activated ()) ? Qt : Qnil; 2378 return (popup_activated ()) ? Qt : Qnil;