*** empty log message ***

2 files changed, 28 insertions, 13 deletions

diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el
index c5ed38bf5e8..c2f98c47f02 100644
--- a/lisp/progmodes/c-mode.el
+++ b/lisp/progmodes/c-mode.el
@@ -546,16 +546,27 @@ Returns nil if line starts inside a string, t if in a comment."
 	       (let ((basic-indent
 		      (save-excursion
 			(re-search-backward "^[^ \^L\t\n#]" nil 'move)
-			(if (and (looking-at "\\sw\\|\\s_")
-				 (looking-at "[^\"\n=]*(")
-				 (progn
-				   (goto-char (1- (match-end 0)))
-				   (forward-sexp 1)
-				   (skip-chars-forward " \t\f")
-				   (and (< (point) indent-point)
-					(not (memq (following-char)
-						   '(?\, ?\;))))))
-			    c-argdecl-indent 0))))
+			(let (comment lim)
+			  (if (and (looking-at "\\sw\\|\\s_")
+				   (looking-at "[^\"\n=]*(")
+				   (progn
+				     (goto-char (1- (match-end 0)))
+				     (setq lim (point))
+				     (forward-sexp 1)
+				     (skip-chars-forward " \t\f")
+				     (and (< (point) indent-point)
+					  (not (memq (following-char)
+						     '(?\, ?\;)))))
+				   ;; Make sure the "function decl" we found
+				   ;; is not inside a comment.
+				   (progn
+				     (beginning-of-line)
+				     (while (and (not comment)
+						 (search-forward "/*" lim t))
+				       (setq comment
+					     (not (search-forward "*/" lim t))))
+				     (not comment)))
+			      c-argdecl-indent 0)))))
 		 basic-indent)))
 
 ;; 		 ;; Now add a little if this is a continuation line.
diff --git a/src/fns.c b/src/fns.c
index b30a2422f7f..90b2c0371b0 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1082,6 +1082,8 @@ SEQUENCE may be a list, a vector or a string.")
 
 DEFUN ("y-or-n-p", Fy_or_n_p, Sy_or_n_p, 1, 1, 0,
   "Ask user a \"y or n\" question.  Return t if answer is \"y\".\n\
+Takes one argument, which is the string to display to ask the question.\n\
+It should end in a space; `y-or-n-p' adds `(y or n) ' to it.\n\
 No confirmation of the answer is requested; a single character is enough.\n\
 Also accepts Space to mean yes, or Delete to mean no.")
   (prompt)
@@ -1151,9 +1153,11 @@ do_yes_or_no_p (prompt)
 /* Anything that calls this function must protect from GC!  */
 
 DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, 1, 0,
-  "Ask user a yes or no question.  Return t if answer is yes.\n\
-The user must confirm the answer with a newline,\n\
-and can rub it out if not confirmed.")
+  "Ask user a yes-or-no question.  Return t if answer is yes.\n\
+Takes one argument, which is the string to display to ask the question.\n\
+It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it.\n\
+The user must confirm the answer with RET,\n\
+and can edit it until it as been confirmed.")
   (prompt)
      Lisp_Object prompt;
 {