diff options
| author | Richard M. Stallman | 2004-11-04 10:04:16 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2004-11-04 10:04:16 +0000 |
| commit | 89bf74f828fc00e65e00ade6757bd08c50fc2f08 (patch) | |
| tree | a941f6635e3f89aac27bb5f2b0942b3322ba9e0f | |
| parent | 9e6856a7a4c07f3cb009768554e81624615c570c (diff) | |
| download | emacs-89bf74f828fc00e65e00ade6757bd08c50fc2f08.tar.gz emacs-89bf74f828fc00e65e00ade6757bd08c50fc2f08.zip | |
Comment change.
| -rw-r--r-- | lisp/files.el | 2 | ||||
| -rw-r--r-- | src/xmenu.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/files.el b/lisp/files.el index 901e0a65f6b..e9ae0fb834f 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -676,7 +676,7 @@ The truename of a file name is found by chasing symbolic links | |||
| 676 | both at the level of the file and at the level of the directories | 676 | both at the level of the file and at the level of the directories |
| 677 | containing it, until no links are left at any level. | 677 | containing it, until no links are left at any level. |
| 678 | 678 | ||
| 679 | \(fn FILENAME)" | 679 | \(fn FILENAME)" ;; Don't document the optional arguments. |
| 680 | ;; COUNTER and PREV-DIRS are only used in recursive calls. | 680 | ;; COUNTER and PREV-DIRS are only used in recursive calls. |
| 681 | ;; COUNTER can be a cons cell whose car is the count of how many | 681 | ;; COUNTER can be a cons cell whose car is the count of how many |
| 682 | ;; more links to chase before getting an error. | 682 | ;; more links to chase before getting an error. |
diff --git a/src/xmenu.c b/src/xmenu.c index 371ae14f12e..d47c1767c31 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1120,9 +1120,13 @@ on the left of the dialog box and all following items on the right. | |||
| 1120 | popped down (deactivated). This is used for x-popup-menu | 1120 | popped down (deactivated). This is used for x-popup-menu |
| 1121 | and x-popup-dialog; it is not used for the menu bar. | 1121 | and x-popup-dialog; it is not used for the menu bar. |
| 1122 | 1122 | ||
| 1123 | If DO_TIMERS is nonzero, run timers. | ||
| 1124 | If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed. | 1123 | If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed. |
| 1125 | 1124 | ||
| 1125 | This function used to have a DO_TIMERS argument which was | ||
| 1126 | 1 in the dialog case, and caused it to run Lisp-level timers. | ||
| 1127 | That was unsafe so we removed it, but does anyone remember | ||
| 1128 | why menus and dialogs were treated differently? | ||
| 1129 | |||
| 1126 | NOTE: All calls to popup_get_selection should be protected | 1130 | NOTE: All calls to popup_get_selection should be protected |
| 1127 | with BLOCK_INPUT, UNBLOCK_INPUT wrappers. */ | 1131 | with BLOCK_INPUT, UNBLOCK_INPUT wrappers. */ |
| 1128 | 1132 | ||