Comment change.

diff --git a/lisp/files.el b/lisp/files.el
index 901e0a65f6bcfe3cdb7549829c95183021c98823..e9ae0fb834f05c77593be7d3c561bf2911589cd4 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -676,7 +676,7 @@ The truename of a file name is found by chasing symbolic links
 both at the level of the file and at the level of the directories
 containing it, until no links are left at any level.
 
-\(fn FILENAME)"
+\(fn FILENAME)"  ;; Don't document the optional arguments.
   ;; COUNTER and PREV-DIRS are only used in recursive calls.
   ;; COUNTER can be a cons cell whose car is the count of how many
   ;; more links to chase before getting an error.

diff --git a/src/xmenu.c b/src/xmenu.c
index 371ae14f12e72354a65c9be0f6564b5b08d1deb1..d47c1767c3184ac25c85f2d09bf87b5f6cf4fd7f 100644 (file)
--- 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.
    popped down (deactivated).  This is used for x-popup-menu
    and x-popup-dialog; it is not used for the menu bar.
 
-   If DO_TIMERS is nonzero, run timers.
    If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed.
 
+   This function used to have a DO_TIMERS argument which was
+   1 in the dialog case, and caused it to run Lisp-level timers.
+   That was unsafe so we removed it, but does anyone remember
+   why menus and dialogs were treated differently?
+
    NOTE: All calls to popup_get_selection should be protected
    with BLOCK_INPUT, UNBLOCK_INPUT wrappers.  */