Mercurial > emacs
comparison lisp/image-mode.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | 31db1aaeac2d 8d9bcdbc2a6e |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
1 ;;; image-mode.el --- support for visiting image files | 1 ;;; image-mode.el --- support for visiting image files |
2 ;; | 2 ;; |
3 ;; Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 3 ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
4 ;; | 4 ;; |
5 ;; Author: Richard Stallman <rms@gnu.org> | 5 ;; Author: Richard Stallman <rms@gnu.org> |
6 ;; Keywords: multimedia | 6 ;; Keywords: multimedia |
7 | 7 |
8 ;; This file is part of GNU Emacs. | 8 ;; This file is part of GNU Emacs. |