branch: externals/auctex
commit c34bf649f5d460fe396d43cff751164ceb2895f7
Merge: 8926369 bee6baf
Author: Tassilo Horn <t...@gnu.org>
Commit: Tassilo Horn <t...@gnu.org>
Merge branch 'master' into simplify-TeX-parse-error
---
ChangeLog | 4 ++++
style/listings.el | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 56743ca..55de221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-02 Jobst Hoffmann <j.hoffm...@fh-aachen.de> (tiny change)
+
+ * style/listings.el ("listings"): Fix typo.
+
2014-05-01 Mos� Giordano <giordano.m...@libero.it>
* font-latex.el (font-latex-set-syntactic-keywords): Fix
diff --git a/style/listings.el b/style/listings.el
index 7b467ed..82ebd71 100644
--- a/style/listings.el
+++ b/style/listings.el
@@ -235,7 +235,7 @@
'("lstloadlanguages" t)
;; 4.17 Short Inline Listing Commands
'("lstMakeShortInline" [ "Options" ] "Character")
- '("lstDeleteShortLine" "Character")
+ '("lstDeleteShortInline" "Character")
"lstgrinddeffile" "lstaspectfiles" "lstlanguagefiles"
"lstlistingname" "lstlistlistingname")
