* riece-debug.el: Suppress byte-compile warnings;

[riece] / lisp / riece-emacs.el

diff --git a/lisp/riece-emacs.el b/lisp/riece-emacs.el
index 2997420..cc58b4c 100644 (file)
--- a/lisp/riece-emacs.el
+++ b/lisp/riece-emacs.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -105,7 +105,7 @@
 
 (defun riece-normalize-modeline-string (string)
   (if (listp string)
-      (riece-normalize-modeline-string-1 string)
+      (list (apply #'concat (riece-normalize-modeline-string-1 string)))
     string))
 
 (defun riece-put-text-property-nonsticky (start end prop value
@@ -135,6 +135,16 @@ If N is nil, all messages will be returned."
            (reverse-region (point-min) (point-max))
            (buffer-string))))))
 
+(defun riece-remprop (symbol property)
+  (let ((plist (symbol-plist symbol)))
+    (if (eq (car plist) property)
+       (setplist symbol (cdr (cdr plist)))
+      (while (and (nthcdr 2 plist)
+                 (not (eq (car (nthcdr 2 plist)) property)))
+       (setq plist (nthcdr 2 plist)))
+      (if (nthcdr 2 plist)
+         (setcdr (cdr plist) (nthcdr 4 plist))))))
+
 (provide 'riece-emacs)
 
 ;;; riece-emacs.el ends here