From 9b38c5e22626ab4823a68ad1c570255e316d2fdf Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 10 Aug 2008 20:11:33 +0000 Subject: [PATCH] (f90-beginning-of-subprogram, f90-end-of-subprogram): Only give a message when interactive (sync from trunk 2008-06-12). --- lisp/ChangeLog | 57 +++++++++++++++++++++++++++++++++++++++++++ lisp/progmodes/f90.el | 4 +-- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6fd42a050a..f23445c2bf2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,60 @@ +2008-08-10 Glenn Morris + + * Makefile.in (bootstrap-prepare): Explictly pass EMACS to sub-makes + that use it, for non-GNU makes (sync from trunk 2008-06-08). + + * cus-dep.el (generated-custom-dependencies-file): Doc fix (sync from + trunk 2008-06-05). + + * finder.el (generated-finder-keywords-file, finder-exit): + Doc fix (sync from trunk 2008-06-05). + + * simple.el (toggle-truncate-lines): Doc fix (sync from trunk + 2008-04-10). + + * subr.el (locate-library): Doc fix (sync from trunk 2008-06-10). + + * emacs-lisp/bytecomp.el (byte-compile-maybe-guarded): Doc fix (sync + from trunk 2008-06-13). + (byte-compile-file): Doc fix (sync from trunk 2008-04-27). + + * progmodes/f90.el (f90-beginning-of-subprogram) + (f90-end-of-subprogram): Only give a message when interactive (sync + from trunk 2008-06-12). + + * progmodes/fortran.el (fortran-end-of-subprogram): Check for a match + before trying to move there (sync from trunk 2008-06-11). + + * calendar/cal-bahai.el (holiday-bahai): Use an algorithm actually + relevant to this calendar system (sync from trunk 2008-03-31). + (calendar-bahai-date-string): Avoid an error for pre-Bahai dates (sync + from trunk 2008-03-31). + (calendar-print-bahai-date): Handle pre-Bahai dates (sync from trunk + 2008-03-20). + (calendar-absolute-from-bahai): Fix the leap-year case (sync from trunk + 2008-03-20). + + * calendar/cal-islam.el (holiday-islamic): Doc fix (sync from trunk + 2008-04-23). + + * calendar/cal-julian.el (holiday-julian): Fix a problem with holidays + in the last fortnight in Julian October (sync from trunk 2008-03-31). + + * calendar/cal-tex.el (cal-tex-preamble-extra): Fix custom type (sync + from trunk 2008-04-11). + + * calendar/calendar.el (calendar-nth-named-absday) + (calendar-nth-named-day): + * calendar/diary-lib.el (list-sexp-diary-entries, diary-float): + * calendar/holidays.el (holiday-float): + Doc fixes (sync from trunk 2008-04-29). + + * calendar/diary-lib.el (simple-diary-display, diary-show-all-entries) + (make-diary-entry): Respect non-nil values of pop-up-frames (sync from + trunk 2008-03-28). + + * calendar/diary-lib.el (diary-remind): Doc fix. + 2008-08-05 Chong Yidong * kmacro.el (kmacro-exec-ring-item): Add autoload. diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 2f40e00135f..2f6051a8bd5 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1234,7 +1234,7 @@ Return (TYPE NAME), or nil if not found." matching-beg ;; Note this includes the case of an un-named main program, ;; in which case we go to (point-min). - (message "No beginning found.") + (if (interactive-p) (message "No beginning found.")) nil))) (defun f90-end-of-subprogram () @@ -1259,7 +1259,7 @@ Return (TYPE NAME), or nil if not found." ;;; (forward-line 1) (if (zerop count) matching-end - (message "No end found.") + (if (interactive-p) (message "No end found.")) nil))) -- 2.39.2