From fb953c6775642e49b34a27a07c45c845bb7161ec Mon Sep 17 00:00:00 2001
From: psg <>
Date: Sat, 12 Apr 2008 13:10:57 +0000
Subject: =?UTF-8?q?Enable=20apt-sources-mode=20for=20files=20in=20/etc/apt?=
 =?UTF-8?q?/sources.list.d/".=20Thanks=20to=20G=C3=A9raud=20Meyer=20for=20?=
 =?UTF-8?q?the=20report=20and=20patch=20(Closes:=20#475701).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian-el.el   | 10 +++++++---
 debian-el.texi |  9 +++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian-el.el b/debian-el.el
index 826c8aa..81ad523 100644
--- a/debian-el.el
+++ b/debian-el.el
@@ -6,6 +6,9 @@
 
 ;;; History:
 ;;
+;; 2008-04-12 - Géraud Meyer
+;;  - Use apt-sources-mode for files in /etc/apt/sources.list.d/ too.
+;;  - Use \' instead of $ for the end of filenames.
 ;; 2003-09-01 - Peter Galbraith
 ;;  - Created.
 
@@ -19,8 +22,9 @@
 ;;(require 'debian-el-custom)
 
 ;; apt-sources
-(add-to-list 'auto-mode-alist '("sources.list$" . apt-sources-mode))
-(defgroup apt-sources nil "Mode for editing apt source.list file"
+(add-to-list 'auto-mode-alist '("sources\\.list\\'" . apt-sources-mode))
+(add-to-list 'auto-mode-alist '("sources\\.list\\.d/.*\\.list\\'" . apt-sources-mode))
+(defgroup apt-sources nil "Mode for editing apt sources.list files"
   :group 'tools
   :prefix "apt-sources-"
   :link '(custom-manual "(debian-el)apt-sources")
@@ -49,7 +53,7 @@
 
 ;; deb-view.el
 (setq auto-mode-alist
-      (append '(("\\.u?deb$" . deb-view-mode)) auto-mode-alist))
+      (append '(("\\.u?deb\\'" . deb-view-mode)) auto-mode-alist))
 (defgroup deb-view nil
   "View Debian package files with tar-mode"
   :group 'tools
diff --git a/debian-el.texi b/debian-el.texi
index db8d810..468e3d6 100644
--- a/debian-el.texi
+++ b/debian-el.texi
@@ -45,7 +45,7 @@ basis, do:
 @end example
 
 @menu
-* apt-sources::                 Mode for editing apt source.list file
+* apt-sources::                 Mode for editing apt sources.list files
 * apt-utils::                   Emacs interface to APT
 * debian-bug::                  Report a bug to Debian's bug tracking system
 * deb-view::                    View Debian package archive files with tar-mode
@@ -69,10 +69,11 @@ works, this text is also licensed under the GPL V2 (See
 @email{psg@@debian.org}.
 
 @node apt-sources, apt-utils, Top, Top
-@chapter apt-sources - Mode for editing apt source.list file.
+@chapter apt-sources - Mode for editing apt sources.list files.
 
-This mode is for editing @file{/etc/apt/sources.list}, the APT
-(Advanced Package Tool) configuration file found on Debian systems.
+This mode is for editing @file{/etc/apt/sources.list} and
+@file{/etc/apt/sources.list.d/*.list}, the APT (Advanced Package Tool)
+configuration files found on Debian systems.
 
 APT is a package retrieval tool for Debian; for example you could
 install Emacs with the command:
-- 
cgit v1.2.3