From: Glenn Morris Date: Mon, 16 Apr 2012 19:18:36 +0000 (-0400) Subject: * lisp/calendar/cal-tex.el (cal-tex-end-document): Trivial clarification. X-Git-Tag: emacs-24.2.90~471^2~352^2~19 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e829eabcd269467345002ad3d7e3b40e3fbd550;p=emacs.git * lisp/calendar/cal-tex.el (cal-tex-end-document): Trivial clarification. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 398d74b124f..49509ae5624 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-04-16 Glenn Morris + * calendar/cal-tex.el (cal-tex-end-document): Trivial clarification. + * play/cookie1.el (cookie-snarf): Give an explicit error if input file cannot be read. diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index 14899431e2a..0ae2b38eaf6 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el @@ -1,6 +1,6 @@ ;;; cal-tex.el --- calendar functions for printing calendars with LaTeX -;; Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc. ;; Author: Steve Fisk ;; Edward M. Reingold @@ -1588,8 +1588,7 @@ informative header, and run HOOK." (cal-tex-e-document) (or (and cal-tex-preamble-extra (string-match "inputenc" cal-tex-preamble-extra)) - (not (re-search-backward "[^[:ascii:]]" nil 'move)) - (progn + (when (re-search-backward "[^[:ascii:]]" nil 'move) (goto-char (point-min)) (when (search-forward "documentclass" nil t) (forward-line 1)