X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-emacs.el;h=cc58b4c786275227d8cd2586396f31ff577a5a74;hp=1cfddda5512583cd9848b06c24aced29b53f21a5;hb=f783b562b1f30b3d7eab4e80870b7decbc10c354;hpb=4f577873da8cbb0638e059b0774f6c22889f33b0

diff --git a/lisp/riece-emacs.el b/lisp/riece-emacs.el
index 1cfddda..cc58b4c 100644
--- 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:
 
@@ -95,6 +95,19 @@
   (add-text-properties 0 (length string) properties string)
   string)
 
+(defun riece-normalize-modeline-string-1 (string)
+  (if string
+      (if (listp (car string))
+	  (cons (car (car string)) (riece-normalize-modeline-string-1
+				    (append (cdr (car string)) (cdr string))))
+	(cons (car string) (riece-normalize-modeline-string-1
+			    (cdr string))))))
+
+(defun riece-normalize-modeline-string (string)
+  (if (listp string)
+      (list (apply #'concat (riece-normalize-modeline-string-1 string)))
+    string))
+
 (defun riece-put-text-property-nonsticky (start end prop value
 						     &optional object)
   (add-text-properties start end
@@ -103,6 +116,35 @@
 
 (defalias 'riece-facep 'facep)
 
+;;; stolen (and renamed) from emacsbug.el.
+(defun riece-recent-messages (n)
+  "Return N most recent messages, most recent first.
+If N is nil, all messages will be returned."
+  (let ((message-buf (get-buffer "*Messages*")))
+    (if message-buf
+	(with-temp-buffer
+	  (let (beg-pos end-pos)
+	    (with-current-buffer message-buf
+	      (setq end-pos (goto-char (point-max)))
+	      (if n
+		  (progn
+		    (forward-line (- n))
+		    (setq beg-pos (point)))
+		(setq beg-pos (point-min))))
+	    (insert-buffer-substring message-buf beg-pos end-pos)
+	    (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