diff options
| author | Glenn Morris | 2018-02-13 14:22:16 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-13 14:22:16 -0800 |
| commit | 4bee1b8bacb9ce6107ea605da464d01f6bd3aa7d (patch) | |
| tree | dc5dc2098f8956b66620cc1003601f705c289cd2 /src/nsmenu.m | |
| parent | 6c7186de3bbb2b7652cdc01a68bee035761197e5 (diff) | |
| download | emacs-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/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 58b45fb38e5..29b0f99e642 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -1874,7 +1874,7 @@ DEFUN ("ns-reset-menu", Fns_reset_menu, Sns_reset_menu, 0, 0, 0, | |||
| 1874 | 1874 | ||
| 1875 | 1875 | ||
| 1876 | DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, | 1876 | DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, |
| 1877 | doc: /* Return t if a menu or popup dialog is active. */) | 1877 | doc: /* SKIP: real doc in xmenu.c. */) |
| 1878 | (void) | 1878 | (void) |
| 1879 | { | 1879 | { |
| 1880 | return popup_activated () ? Qt : Qnil; | 1880 | return popup_activated () ? Qt : Qnil; |