master a190bc9 2/2: Delete two more items obsoleted in Emacs 23.1

[Stefan Kangas]

branch: master
commit a190bc9f3067d9c35fc4344248222eb6ff2a0fc6
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Delete two more items obsoleted in Emacs 23.1
    
    * lisp/calendar/icalendar.el
    (icalendar--datetime-to-noneuropean-date): Remove alias obsolete since
    * lisp/obsolete/nnir.el (nnir-swish-e-index-file):
    Delete items obsolete since Emacs 23.1.
    
    ; * etc/NEWS: List removed items.
---
 etc/NEWS                   | 16 +++++++++-------
 lisp/calendar/icalendar.el |  3 ---
 lisp/obsolete/nnir.el      | 14 ++------------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 3d94a03..ce337e7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2350,18 +2350,20 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el.
 'forward-point', 'generic-char-p', 'global-highlight-changes',
 'hi-lock-face-history', 'hi-lock-regexp-history',
 'highlight-changes-active-string', 'highlight-changes-initial-state',
-'highlight-changes-passive-string', 'image-mode-maybe',
+'highlight-changes-passive-string',
+'icalendar--datetime-to-noneuropean-date', 'image-mode-maybe',
 'imenu-example--name-and-position', 'ispell-aspell-supports-utf8',
 'lisp-mode-auto-fill', 'locate-file-completion', 'make-coding-system',
 'minibuffer-local-must-match-filename-map', 'mouse-choose-completion',
 'mouse-major-mode-menu', 'mouse-popup-menubar',
 'mouse-popup-menubar-stuff', 'newsticker-groups-filename',
-'nnmail-fix-eudora-headers', 'non-iso-charset-alist',
-'nonascii-insert-offset', 'nonascii-translation-table',
-'password-read-and-add', 'pre-abbrev-expand-hook', 'princ-list',
-'print-help-return-message', 'process-filter-multibyte-p',
-'read-file-name-predicate', 'remember-buffer', 'rmail-highlight-face',
-'rmail-message-filter', 'semantic-after-idle-scheduler-reparse-hooks',
+'nnir-swish-e-index-file', 'nnmail-fix-eudora-headers',
+'non-iso-charset-alist', 'nonascii-insert-offset',
+'nonascii-translation-table', 'password-read-and-add',
+'pre-abbrev-expand-hook', 'princ-list', 'print-help-return-message',
+'process-filter-multibyte-p', 'read-file-name-predicate',
+'remember-buffer', 'rmail-highlight-face', 'rmail-message-filter',
+'semantic-after-idle-scheduler-reparse-hooks',
 'semantic-after-toplevel-bovinate-hook',
 'semantic-before-idle-scheduler-reparse-hooks',
 'semantic-before-toplevel-bovination-hook',
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 0b6ff56..8f4dbf0 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -773,9 +773,6 @@ American format: \"month day year\"."
     ;; datetime == nil
     nil))
 
-(define-obsolete-function-alias 'icalendar--datetime-to-noneuropean-date
-  'icalendar--datetime-to-american-date "23.1")
-
 (defun icalendar--datetime-to-european-date (datetime &optional separator)
   "Convert the decoded DATETIME to European format.
 Optional argument SEPARATOR gives the separator between month,
diff --git a/lisp/obsolete/nnir.el b/lisp/obsolete/nnir.el
index 7d7e881..fef76ba 100644
--- a/lisp/obsolete/nnir.el
+++ b/lisp/obsolete/nnir.el
@@ -275,21 +275,11 @@ that it is for swish++, not Namazu."
 
 ;; Swish-E.
 ;; URL: http://swish-e.org/
-;; Variables `nnir-swish-e-index-file', `nnir-swish-e-program' and
+;; Variables `nnir-swish-e-index-files', `nnir-swish-e-program' and
 ;; `nnir-swish-e-additional-switches'
 
-(make-obsolete-variable 'nnir-swish-e-index-file
-                        'nnir-swish-e-index-files "23.1")
-(defcustom nnir-swish-e-index-file
-  (expand-file-name "~/Mail/index.swish-e")
-  "Index file for swish-e.
-This could be a server parameter.
-It is never consulted once `nnir-swish-e-index-files', which should be
-used instead, has been customized."
-  :type '(file))
-
 (defcustom nnir-swish-e-index-files
-  (list nnir-swish-e-index-file)
+  (list (expand-file-name "~/Mail/index.swish-e"))
   "List of index files for swish-e.
 This could be a server parameter."
   :type '(repeat (file)))