[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-devel] [elpa] externals/auctex c34bf64 07/69: Merge branch 'mast
From: |
Tassilo Horn |
Subject: |
[AUCTeX-devel] [elpa] externals/auctex c34bf64 07/69: Merge branch 'master' into simplify-TeX-parse-error |
Date: |
Sat, 26 Mar 2016 21:36:32 +0000 |
branch: externals/auctex
commit c34bf649f5d460fe396d43cff751164ceb2895f7
Merge: 8926369 bee6baf
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>
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 <address@hidden> (tiny change)
+
+ * style/listings.el ("listings"): Fix typo.
+
2014-05-01 Mos� Giordano <address@hidden>
* 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")
- [AUCTeX-devel] [elpa] externals/auctex updated (0a99c11 -> f1abcf8), Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex 836e461 03/69: Don't use TRIM arg of split-string., Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex c34bf64 07/69: Merge branch 'master' into simplify-TeX-parse-error,
Tassilo Horn <=
- [AUCTeX-devel] [elpa] externals/auctex 056d8c8 50/69: Fix TeX-check-files, Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex e4cad1c 46/69: Add support for Atril viewer, Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex 188e4b1 66/69: Temporarily bind gc-cons-threshold in time-consuming task, Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex d4059b8 02/69: Improve line wrap removal heuristics., Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex f1bcbe3 54/69: Improve LaTeX-warnings-regexp, Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex 0731fff 10/69: Merge branch 'master' into simplify-TeX-parse-error, Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex 8926369 06/69: Improve new-file regex., Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex f7d0535 34/69: Fix file name regexp in TeX-documentation-texdoc, Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex c09c405 48/69: Fix wrong usage of `TeX-auto-prepare-hook', Tassilo Horn, 2016/03/26
- [AUCTeX-devel] [elpa] externals/auctex 7d4bfac 18/69: Merge branch 'master' into simplify-TeX-parse-error, Tassilo Horn, 2016/03/26