2 files changed, 18 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc4997e00f3..fcb4fac5cc9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/ld-script.el (auto-mode-alist): Use \' rather than $.
+        (ld-script-mode): Don't set indent-line-function since we don't
+        have one.
+
 2006-01-13  Carsten Dominik  <dominik@science.uva.nl>
 
         * textmodes/org.el: (org-open-file): Use mailcap for selecting an
@@ -5,17 +11,16 @@
         (org-file-apps-defaults-gnu): Use mailcap as the default for
         selecting an application on a UNIX system.
         (org-agenda-show-tags): New command.
-        (org-table-insert-hline): Keep cursor in current table
-        line.
+        (org-table-insert-hline): Keep cursor in current table line.
         (org-table-convert): Offset effect of modifying
         `org-table-insert-hline'.
         (org-format-agenda-item): New optional argument TAG.
         (org-compile-prefix-format): Handle %T format for the tag.
         (org-expand-wide-chars): New function.
-        (org-table-insert-row, org-table-insert-hline): Use
-        `org-expand-wide-chars'.
-        (org-open-file): Fixed bug in program launch.
-        (org-get-time-of-day): Fixed bug with times before 1am.
+        (org-table-insert-row, org-table-insert-hline):
+        Use `org-expand-wide-chars'.
+        (org-open-file): Fix bug in program launch.
+        (org-get-time-of-day): Fix bug with times before 1am.
         (org-agenda-menu): Addes tags commands.
 
 2006-01-13  Agustin Martin  <agustin.martin@hispalinux.es>
@@ -27,8 +32,8 @@
         and flyspell word cache cleared out for the current buffer.
         (ispell-change-dictionary): Make sure flyspell word cache is
         cleared out in all buffers with active flyspell mode when
-        dictionary is globally changed.  Call
-        ispell-internal-change-dictionary after dictionary change.
+        dictionary is globally changed.
+        Call ispell-internal-change-dictionary after dictionary change.
 
 2006-01-13  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 31a616fab51..bdb386dc5e9 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -36,7 +36,7 @@
 
 (defvar ld-script-location-counter-face 'ld-script-location-counter)
 (defface ld-script-location-counter
-  '((t (:weight bold :inherit font-lock-builtin-face)))
+  '((t :weight bold :inherit font-lock-builtin-face))
   "Face for location counter in GNU ld script."
   :group 'ld-script)
 
@@ -131,18 +131,18 @@
 ;; Netbsd uses "ldscript.*".
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.ld[si]?\\>" . ld-script-mode))
-(add-to-list 'auto-mode-alist '("ld[.]?script\\>" . ld-script-mode))
+(add-to-list 'auto-mode-alist '("ld\\.?script\\>" . ld-script-mode))
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.x[bdsru]?[cn]?$" . ld-script-mode))
+(add-to-list 'auto-mode-alist '("\\.x[bdsru]?[cn]?\\'" . ld-script-mode))
 
 ;;;###autoload
 (define-derived-mode ld-script-mode nil "LD-Script"
    "A major mode to edit GNU ld script files"
   (set (make-local-variable 'comment-start) "/* ")
   (set (make-local-variable 'comment-end)   " */")
-  (set (make-local-variable 'indent-line-function) #'indent-relative)
-  (set (make-local-variable 'font-lock-defaults) '(ld-script-font-lock-keywords nil)))
+  (set (make-local-variable 'font-lock-defaults)
+       '(ld-script-font-lock-keywords nil)))
 
 (provide 'ld-script)